Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c31af398 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54bc6c0b

drivers/pci/msi.c

+2 −7
Original line number Diff line number Diff line
@@ -719,12 +719,7 @@ 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);

	}

	if (dev->msix_enabled) {