Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / pci / setup-irq.c

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 05ca2ed9eb51fdc24340a3244a087e4680ae86ce..eec9738f34927c7a3b87c6f9d647a5c3b1207877 100644 (file)
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -47,8 +47,7 @@ pdev_fixup_irq(struct pci_dev *dev,
        }
        dev->irq = irq;
 
-       pr_debug("PCI: fixup irq: (%s) got %d\n",
-               kobject_name(&dev->dev.kobj), dev->irq);
+       dev_dbg(&dev->dev, "fixup irq: got %d\n", dev->irq);
 
        /* Always tell the device, so the driver knows what is
           the real IRQ to use; the device does not use it. */
@@ -60,7 +59,6 @@ pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
               int (*map_irq)(struct pci_dev *, u8, u8))
 {
        struct pci_dev *dev = NULL;
-       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev)
                pdev_fixup_irq(dev, swizzle, map_irq);
-       }
 }