Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e387b9eefe89a23245f2446f947529cce5d6db35
Commit:     e387b9eefe89a23245f2446f947529cce5d6db35
Parent:     54eee4c5bf553ad54ba200d00487b61eb6b155f6
Author:     Michael Ellerman <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 22 21:51:27 2007 +1100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed May 2 19:02:35 2007 -0700

    MSI: Simplify BUG() handling in pci_disable_msi()
    
    Although it might be nice to do a printk before BUG'ing, it's really not
    necessary, and it complicates the code.
    
    Signed-off-by: Michael Ellerman <[EMAIL PROTECTED]>
    Acked-by: Eric W. Biederman <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/pci/msi.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index a4ef93e..9213c57 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -572,18 +572,15 @@ void pci_disable_msi(struct pci_dev* dev)
        if (!entry || !entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
                return;
        }
-       if (irq_has_action(dev->first_msi_irq)) {
-               printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
-                      "free_irq() on MSI irq %d\n",
-                      pci_name(dev), dev->first_msi_irq);
-               BUG_ON(irq_has_action(dev->first_msi_irq));
-       } else {
-               default_irq = entry->msi_attrib.default_irq;
-               msi_free_irq(dev, dev->first_msi_irq);
-
-               /* Restore dev->irq to its default pin-assertion irq */
-               dev->irq = default_irq;
-       }
+
+       BUG_ON(irq_has_action(dev->first_msi_irq));
+
+       default_irq = entry->msi_attrib.default_irq;
+       msi_free_irq(dev, dev->first_msi_irq);
+
+       /* Restore dev->irq to its default pin-assertion irq */
+       dev->irq = default_irq;
+
        dev->first_msi_irq = 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to