vserver 1.9.3

[linux-2.6.git] / arch / sparc64 / kernel / pci_common.c

diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index fda6524..58310aa 100644 (file)
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -15,18 +15,13 @@
  */
 void __init pci_fixup_host_bridge_self(struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
-
-       walk = walk->next;
-       while (walk != &pbus->devices) {
-               struct pci_dev *pdev = pci_dev_b(walk);
+       struct pci_dev *pdev;
 
+       list_for_each_entry(pdev, &pbus->devices, bus_list) {
                if (pdev->class >> 8 == PCI_CLASS_BRIDGE_HOST) {
                        pbus->self = pdev;
                        return;
                }
-
-               walk = walk->next;
        }
 
        prom_printf("PCI: Critical error, cannot find host bridge PDEV.\n");
@@ -217,31 +212,18 @@ void __init pci_fill_in_pbm_cookies(struct pci_bus *pbus,
                                    struct pci_pbm_info *pbm,
                                    int prom_node)
 {
-       struct list_head *walk = &pbus->devices;
-
-       /* This loop is coded like this because the cookie
-        * fillin routine can delete devices from the tree.
-        */
-       walk = walk->next;
-       while (walk != &pbus->devices) {
-               struct pci_dev *pdev = pci_dev_b(walk);
-               struct list_head *walk_next = walk->next;
+       struct pci_dev *pdev, *pdev_next;
+       struct pci_bus *this_pbus, *pbus_next;
 
+       /* This must be _safe because the cookie fillin
+          routine can delete devices from the tree.  */
+       list_for_each_entry_safe(pdev, pdev_next, &pbus->devices, bus_list)
                pdev_cookie_fillin(pbm, pdev, prom_node);
 
-               walk = walk_next;
-       }
-
-       walk = &pbus->children;
-       walk = walk->next;
-       while (walk != &pbus->children) {
-               struct pci_bus *this_pbus = pci_bus_b(walk);
+       list_for_each_entry_safe(this_pbus, pbus_next, &pbus->children, node) {
                struct pcidev_cookie *pcp = this_pbus->self->sysdata;
-               struct list_head *walk_next = walk->next;
 
                pci_fill_in_pbm_cookies(this_pbus, pbm, pcp->prom_node);
-
-               walk = walk_next;
        }
 }
 
@@ -431,14 +413,14 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
 void __init pci_record_assignments(struct pci_pbm_info *pbm,
                                   struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *dev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next)
-               pdev_record_assignments(pbm, pci_dev_b(walk));
+       list_for_each_entry(dev, &pbus->devices, bus_list)
+               pdev_record_assignments(pbm, dev);
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_record_assignments(pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_record_assignments(pbm, bus);
 }
 
 /* Return non-zero if PDEV has implicit I/O resources even
@@ -549,14 +531,14 @@ static void __init pdev_assign_unassigned(struct pci_pbm_info *pbm,
 void __init pci_assign_unassigned(struct pci_pbm_info *pbm,
                                  struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *dev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next)
-               pdev_assign_unassigned(pbm, pci_dev_b(walk));
+       list_for_each_entry(dev, &pbus->devices, bus_list)
+               pdev_assign_unassigned(pbm, dev);
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_assign_unassigned(pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_assign_unassigned(pbm, bus);
 }
 
 static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt)
@@ -797,14 +779,14 @@ have_irq:
 void __init pci_fixup_irq(struct pci_pbm_info *pbm,
                          struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *dev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next)
-               pdev_fixup_irq(pci_dev_b(walk));
+       list_for_each_entry(dev, &pbus->devices, bus_list)
+               pdev_fixup_irq(dev);
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_fixup_irq(pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_fixup_irq(pbm, bus);
 }
 
 static void pdev_setup_busmastering(struct pci_dev *pdev, int is_66mhz)
@@ -897,7 +879,7 @@ static void pdev_setup_busmastering(struct pci_dev *pdev, int is_66mhz)
 void pci_determine_66mhz_disposition(struct pci_pbm_info *pbm,
                                     struct pci_bus *pbus)
 {
-       struct list_head *walk;
+       struct pci_dev *pdev;
        int all_are_66mhz;
        u16 status;
 
@@ -906,11 +888,8 @@ void pci_determine_66mhz_disposition(struct pci_pbm_info *pbm,
                goto out;
        }
 
-       walk = &pbus->devices;
        all_are_66mhz = 1;
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next) {
-               struct pci_dev *pdev = pci_dev_b(walk);
-
+       list_for_each_entry(pdev, &pbus->devices, bus_list) {
                pci_read_config_word(pdev, PCI_STATUS, &status);
                if (!(status & PCI_STATUS_66MHZ)) {
                        all_are_66mhz = 0;
@@ -929,17 +908,17 @@ out:
 void pci_setup_busmastering(struct pci_pbm_info *pbm,
                            struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *dev;
+       struct pci_bus *bus;
        int is_66mhz;
 
        is_66mhz = pbm->is_66mhz_capable && pbm->all_devs_66mhz;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next)
-               pdev_setup_busmastering(pci_dev_b(walk), is_66mhz);
+       list_for_each_entry(dev, &pbus->devices, bus_list)
+               pdev_setup_busmastering(dev, is_66mhz);
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_setup_busmastering(pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_setup_busmastering(pbm, bus);
 }
 
 void pci_register_legacy_regions(struct resource *io_res,
@@ -987,10 +966,10 @@ void pci_scan_for_target_abort(struct pci_controller_info *p,
                               struct pci_pbm_info *pbm,
                               struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *pdev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next) {
-               struct pci_dev *pdev = pci_dev_b(walk);
+       list_for_each_entry(pdev, &pbus->devices, bus_list) {
                u16 status, error_bits;
 
                pci_read_config_word(pdev, PCI_STATUS, &status);
@@ -1005,19 +984,18 @@ void pci_scan_for_target_abort(struct pci_controller_info *p,
                }
        }
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_scan_for_target_abort(p, pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_scan_for_target_abort(p, pbm, bus);
 }
 
 void pci_scan_for_master_abort(struct pci_controller_info *p,
                               struct pci_pbm_info *pbm,
                               struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *pdev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next) {
-               struct pci_dev *pdev = pci_dev_b(walk);
+       list_for_each_entry(pdev, &pbus->devices, bus_list) {
                u16 status, error_bits;
 
                pci_read_config_word(pdev, PCI_STATUS, &status);
@@ -1031,19 +1009,18 @@ void pci_scan_for_master_abort(struct pci_controller_info *p,
                }
        }
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_scan_for_master_abort(p, pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_scan_for_master_abort(p, pbm, bus);
 }
 
 void pci_scan_for_parity_error(struct pci_controller_info *p,
                               struct pci_pbm_info *pbm,
                               struct pci_bus *pbus)
 {
-       struct list_head *walk = &pbus->devices;
+       struct pci_dev *pdev;
+       struct pci_bus *bus;
 
-       for (walk = walk->next; walk != &pbus->devices; walk = walk->next) {
-               struct pci_dev *pdev = pci_dev_b(walk);
+       list_for_each_entry(pdev, &pbus->devices, bus_list) {
                u16 status, error_bits;
 
                pci_read_config_word(pdev, PCI_STATUS, &status);
@@ -1058,7 +1035,6 @@ void pci_scan_for_parity_error(struct pci_controller_info *p,
                }
        }
 
-       walk = &pbus->children;
-       for (walk = walk->next; walk != &pbus->children; walk = walk->next)
-               pci_scan_for_parity_error(p, pbm, pci_bus_b(walk));
+       list_for_each_entry(bus, &pbus->children, node)
+               pci_scan_for_parity_error(p, pbm, bus);
 }