2 files changed, 22 insertions, 27 deletions

diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c
index febb9cd83177..b5b036f64275 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.c
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.c
@@ -106,7 +106,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 if (!r->flags)
                                         continue;
                                 if (!r->start ||
-                                    pci_claim_resource(dev, idx) < 0) {
+                                    pci_claim_bridge_resource(dev, idx) < 0) {
                                         printk(KERN_ERR "PCI:"
                                                " Cannot allocate resource"
                                                " region %d of bridge %s\n",
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 6b4339f8c9c2..471ff398090c 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -281,42 +281,37 @@ static int __init pci_check_direct(void)
         return -ENODEV;
 }
 
-static int is_valid_resource(struct pci_dev *dev, int idx)
+static void pcibios_fixup_device_resources(struct pci_dev *dev)
 {
-        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        struct resource *devr = &dev->resource[idx], *busr;
-
-        if (dev->bus) {
-                pci_bus_for_each_resource(dev->bus, busr, i) {
-                        if (!busr || (busr->flags ^ devr->flags) & type_mask)
-                                continue;
-
-                        if (devr->start &&
-                            devr->start >= busr->start &&
-                            devr->end <= busr->end)
-                                return 1;
-                }
-        }
+        int idx;
 
-        return 0;
+        if (!dev->bus)
+                return;
+
+        for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
+
+                if (!r->flags || r->parent || !r->start)
+                        continue;
+
+                pci_claim_resource(dev, idx);
+        }
 }
 
-static void pcibios_fixup_device_resources(struct pci_dev *dev)
+static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
-        int limit, i;
+        int idx;
 
-        if (dev->bus->number != 0)
+        if (!dev->bus)
                 return;
 
-        limit = (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) ?
-                PCI_BRIDGE_RESOURCES : PCI_NUM_RESOURCES;
+        for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
 
-        for (i = 0; i < limit; i++) {
-                if (!dev->resource[i].flags)
+                if (!r->flags || r->parent || !r->start)
                         continue;
 
-                if (is_valid_resource(dev, i))
-                        pci_claim_resource(dev, i);
+                pci_claim_bridge_resource(dev, idx);
         }
 }
 
@@ -330,7 +325,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 
         if (bus->self) {
                 pci_read_bridge_bases(bus);
-                pcibios_fixup_device_resources(bus->self);
+                pcibios_fixup_bridge_resources(bus->self);
         }
 
         list_for_each_entry(dev, &bus->devices, bus_list)