Merge branch 'pci/list-for-each-entry' into next

* pci/list-for-each-entry:
  PCI: Remove pci_bus_b() and use list_for_each_entry() directly
  pcmcia: Use list_for_each_entry() for bus traversal
  powerpc/PCI: Use list_for_each_entry() for bus traversal
  drm: Use list_for_each_entry() for bus traversal
  ARM/PCI: Use list_for_each_entry() for bus traversal
  ACPI / hotplug / PCI: Use list_for_each_entry() for bus traversal

9 files changed, 28 insertions, 33 deletions

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 317da88ae65b..004670e97ca8 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -57,13 +57,10 @@ static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, in
 
 void pcibios_report_status(u_int status_mask, int warn)
 {
-        struct list_head *l;
-
-        list_for_each(l, &pci_root_buses) {
-                struct pci_bus *bus = pci_bus_b(l);
+        struct pci_bus *bus;
 
+        list_for_each_entry(bus, &pci_root_buses, node)
                 pcibios_bus_report_status(bus, status_mask, warn);
-        }
 }
 
 /*
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index a9e311f7a9dd..2a4779091a58 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -208,7 +208,6 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
                           unsigned long in_devfn)
 {
         struct pci_controller* hose;
-        struct list_head *ln;
         struct pci_bus *bus = NULL;
         struct device_node *hose_node;
 
@@ -230,8 +229,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
          * used on pre-domains setup. We return the first match
          */
 
-        for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
-                bus = pci_bus_b(ln);
+        list_for_each_entry(bus, &pci_root_buses, node) {
                 if (in_bus >= bus->number && in_bus <= bus->busn_res.end)
                         break;
                 bus = NULL;
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index efe61374f6ea..203cbf0dc101 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -37,15 +37,15 @@ find_bus_among_children(struct pci_bus *bus,
                         struct device_node *dn)
 {
         struct pci_bus *child = NULL;
-        struct list_head *tmp;
+        struct pci_bus *tmp;
         struct device_node *busdn;
 
         busdn = pci_bus_to_OF_node(bus);
         if (busdn == dn)
                 return bus;
 
-        list_for_each(tmp, &bus->children) {
-                child = find_bus_among_children(pci_bus_b(tmp), dn);
+        list_for_each_entry(tmp, &bus->children, node) {
+                child = find_bus_among_children(tmp, dn);
                 if (child)
                         break;
         };
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 7f2af9aca038..309023f12d7f 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -319,7 +319,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                         pci_dev_put(pci_dev);
                 }
                 if (!dev->hose) {
-                        struct pci_bus *b = pci_bus_b(pci_root_buses.next);
+                        struct pci_bus *b = list_entry(pci_root_buses.next,
+                                struct pci_bus, node);
                         if (b)
                                 dev->hose = b->sysdata;
                 }
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index cd929aed3613..aee6a0acbbe9 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -450,7 +450,7 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
  */
 static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
 {
-        struct list_head *tmp;
+        struct pci_bus *tmp;
         unsigned char max, n;
 
         /*
@@ -463,8 +463,8 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
          */
         max = bus->busn_res.start;
 
-        list_for_each(tmp, &bus->children) {
-                n = pci_bus_max_busnr(pci_bus_b(tmp));
+        list_for_each_entry(tmp, &bus->children, node) {
+                n = pci_bus_max_busnr(tmp);
                 if (n > max)
                         max = n;
         }
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b89502ff3139..e4d45d27f288 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -108,12 +108,12 @@ static bool pcie_ari_disabled;
  */
 unsigned char pci_bus_max_busnr(struct pci_bus* bus)
 {
-        struct list_head *tmp;
+        struct pci_bus *tmp;
         unsigned char max, n;
 
         max = bus->busn_res.end;
-        list_for_each(tmp, &bus->children) {
-                n = pci_bus_max_busnr(pci_bus_b(tmp));
+        list_for_each_entry(tmp, &bus->children, node) {
+                n = pci_bus_max_busnr(tmp);
                 if(n > max)
                         max = n;
         }
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 3ff2ac7c14e2..4a1b972efe7f 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -54,14 +54,14 @@ pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
 
 static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
 {
-        struct pci_bus* child;
-        struct list_head *tmp;
+        struct pci_bus *child;
+        struct pci_bus *tmp;
 
         if(bus->number == busnr)
                 return bus;
 
-        list_for_each(tmp, &bus->children) {
-                child = pci_do_find_bus(pci_bus_b(tmp), busnr);
+        list_for_each_entry(tmp, &bus->children, node) {
+                child = pci_do_find_bus(tmp, busnr);
                 if(child)
                         return child;
         }
@@ -111,7 +111,7 @@ pci_find_next_bus(const struct pci_bus *from)
         down_read(&pci_bus_sem);
         n = from ? from->node.next : pci_root_buses.next;
         if (n != &pci_root_buses)
-                b = pci_bus_b(n);
+                b = list_entry(n, struct pci_bus, node);
         up_read(&pci_bus_sem);
         return b;
 }
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 8485761e76af..946f90ef6020 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1076,7 +1076,7 @@ static void yenta_config_init(struct yenta_socket *socket)
  */
 static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
 {
-        struct list_head *tmp;
+        struct pci_bus *sibling;
         unsigned char upper_limit;
         /*
          * We only check and fix the parent bridge: All systems which need
@@ -1095,18 +1095,18 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
         /* stay within the limits of the bus range of the parent: */
         upper_limit = bridge_to_fix->parent->busn_res.end;
 
-        /* check the bus ranges of all silbling bridges to prevent overlap */
-        list_for_each(tmp, &bridge_to_fix->parent->children) {
-                struct pci_bus *silbling = pci_bus_b(tmp);
+        /* check the bus ranges of all sibling bridges to prevent overlap */
+        list_for_each_entry(sibling, &bridge_to_fix->parent->children,
+                        node) {
                 /*
-                 * If the silbling has a higher secondary bus number
+                 * If the sibling has a higher secondary bus number
                  * and it's secondary is equal or smaller than our
                  * current upper limit, set the new upper limit to
-                 * the bus number below the silbling's range:
+                 * the bus number below the sibling's range:
                  */
-                if (silbling->busn_res.start > bridge_to_fix->busn_res.end
-                    && silbling->busn_res.start <= upper_limit)
-                        upper_limit = silbling->busn_res.start - 1;
+                if (sibling->busn_res.start > bridge_to_fix->busn_res.end
+                    && sibling->busn_res.start <= upper_limit)
+                        upper_limit = sibling->busn_res.start - 1;
         }
 
         /* Show that the wanted subordinate number is not possible: */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1e26fc602adc..27b1b9b6dba5 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -463,7 +463,6 @@ struct pci_bus {
         unsigned int            is_added:1;
 };
 
-#define pci_bus_b(n)    list_entry(n, struct pci_bus, node)
 #define to_pci_bus(n)   container_of(n, struct pci_bus, dev)
 
 /*