lkml.org 
[lkml]   [2007]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 1/21] MSI: Simplify BUG() handling in pci_disable_msi()
Date
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;
> }
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-03-28 05:23    [W:0.026 / U:1.812 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site