2 files changed, 10 insertions, 13 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index e640810e813f..2597f9545d8a 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1047,10 +1047,8 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)
 
         struct pci_dev *dev = bus->self;
 
-        for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
-                if ((res = bus->resource[i]) == NULL)
-                        continue;
-                if (!res->flags)
+        pci_bus_for_each_resource(bus, res, i) {
+                if (!res || !res->flags)
                         continue;
                 if (i >= 3 && bus->self->transparent)
                         continue;
@@ -1277,9 +1275,8 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
         pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",
                  pci_domain_nr(bus), bus->number);
 
-        for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
-                if ((res = bus->resource[i]) == NULL || !res->flags
-                    || res->start > res->end || res->parent)
+        pci_bus_for_each_resource(bus, res, i) {
+                if (!res || !res->flags || res->start > res->end || res->parent)
                         continue;
                 if (bus->parent == NULL)
                         pr = (res->flags & IORESOURCE_IO) ?
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index fd23a1d4b39d..8b0c2082a783 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -222,6 +222,7 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)
         int i;
         u8 *dummy;
         struct pci_bus *bus = dev->bus;
+        struct resource *res;
         resource_size_t end = 0;
 
         for (i = PCI_BRIDGE_RESOURCES; i < PCI_BRIDGE_RESOURCES+3; i++) {
@@ -230,13 +231,12 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)
                         end = pci_resource_end(dev, i);
         }
 
-        for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
-                if ((bus->resource[i]) &&
-                        (bus->resource[i]->flags & IORESOURCE_MEM)) {
-                        if (bus->resource[i]->end == end)
-                                dummy = ioremap(bus->resource[i]->start, 0x4);
+        pci_bus_for_each_resource(bus, res, i) {
+                if (res && res->flags & IORESOURCE_MEM) {
+                        if (res->end == end)
+                                dummy = ioremap(res->start, 0x4);
                         else
-                                dummy = ioremap(bus->resource[i]->end - 3, 0x4);
+                                dummy = ioremap(res->end - 3, 0x4);
                         if (dummy) {
                                 in_8(dummy);
                                 iounmap(dummy);