* Re: [PATCH 1/21] MSI: Simplify BUG() handling in pci_disable_msi()
[not found] <20070322105328.4AB74DDF3D@ozlabs.org>
@ 2007-03-28 3:19 ` Eric W. Biederman
0 siblings, 0 replies; only message in thread
From: Eric W. Biederman @ 2007-03-28 3:19 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-pci, Greg Kroah-Hartman, David S. Miller,
Benjamin Herrenschmidt, linux-kernel, Andrew Morton,
daniel.e.wolstenholme
Michael Ellerman <michael@ellerman.id.au> writes:
> Although it might be nice to do a printk before BUG'ing, it's really not
> necessary, and it complicates the code.
>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> ---
>
> drivers/pci/msi.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> Index: msi-new/drivers/pci/msi.c
> ===================================================================
> --- msi-new.orig/drivers/pci/msi.c
> +++ msi-new/drivers/pci/msi.c
> @@ -646,18 +646,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;
> }
>
^ permalink raw reply [flat|nested] only message in thread