MSI: Simplify BUG() handling in pci_disable_msi()
A message that is not in the archive (sent off-list or not yet received): [email protected]
Eric W. Biederman
Acked-byQuoted 3 lines · Michael Ellerman
Although it might be nice to do a printk before BUG'ing, it's really not necessary, and it complicates the code.
Quoted 37 lines
Signed-off-by Michael Ellerman <[email protected]>---
drivers/pci/msi.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)Index:
msi-new/drivers/pci/msi.c
===================================================================drivers/pci/msi.c +8
-11@@ -646,18 +646,15 @@ void pci_disable_msi(struct pci_dev* devif (!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 ; }