MSI: Simplify BUG() handling in msi_remove_pci_irq_vectors() part 1

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 <michael@ellerman.id.au>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index db452319be90..2a119f8d0dc6 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -719,13 +719,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
                 return;
 
         if (dev->msi_enabled) {
-                if (irq_has_action(dev->first_msi_irq)) {
-                        printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                               "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 /* Release MSI irq assigned to this device */
-                        msi_free_irq(dev, dev->first_msi_irq);
+                BUG_ON(irq_has_action(dev->first_msi_irq));
+                msi_free_irq(dev, dev->first_msi_irq);
         }
         if (dev->msix_enabled) {
                 int irq, head, tail = 0, warning = 0;