PCI: use for_each_pci_dev()

Use for_each_pci_dev() to simplify the code.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 5317e4d7d96eab58ac6c24a450022ae82a5c13e5..17d10e2e8fb692f2f605fc6a63571df63ff46a14 100644 (file)
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -135,7 +135,7 @@ static int __init init_legacy(void)
        struct pci_dev *pdev = NULL;
 
        /* Add existing devices */
-       while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)))
+       for_each_pci_dev(pdev)
                legacy_add_slot(pdev);
 
        /* Be alerted of any new ones */

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 68316b59d7d3008450595cf53bc8c44ab36e19a1..01f0306525a504a7ed2a9f954f7376e06170c57e 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -483,9 +483,9 @@ static int __init pci_proc_init(void)
        proc_create("devices", 0, proc_bus_pci_dir,
                    &proc_bus_pci_dev_operations);
        proc_initialized = 1;
-       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev)
                pci_proc_attach_device(dev);
-       }
+
        return 0;
 }
 

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 202efa6f57c4bff21649d257f2a482ea4b47f24d..8141f442e3dfa0ea36c2e4e2f20e0596eb56d344 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2773,7 +2773,7 @@ static int __init pci_apply_final_quirks(void)
                printk(KERN_DEBUG "PCI: CLS %u bytes\n",
                       pci_cache_line_size << 2);
 
-       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev) {
                pci_fixup_device(pci_fixup_final, dev);
                /*
                 * If arch hasn't set it explicitly yet, use the CLS

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 20d03f7722890807b5a128a2032878180794435d..9d75dc8ca602995826b80c842e40edfea1a2d866 100644 (file)
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -169,7 +169,7 @@ struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus,
 {
        struct pci_dev *dev = NULL;
 
-       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev) {
                if (pci_domain_nr(dev->bus) == domain &&
                    (dev->bus->number == bus && dev->devfn == devfn))
                        return dev;

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index aa795fd428ded07fd01d25755fe6680e6091041c..eec9738f34927c7a3b87c6f9d647a5c3b1207877 100644 (file)
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -59,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);
-       }
 }