21 files changed, 119 insertions, 82 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 98a1525fa164..82f738e5d54c 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -338,6 +338,8 @@ common_init_pci(void)
 
                 bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,
                                         hose, &resources);
+                if (!bus)
+                        continue;
                 hose->bus = bus;
                 hose->need_domain_info = need_domain_info;
                 next_busno = bus->busn_res.end + 1;
@@ -353,6 +355,11 @@ common_init_pci(void)
 
         pci_assign_unassigned_resources();
         pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
+        for (hose = hose_head; hose; hose = hose->next) {
+                bus = hose->bus;
+                if (bus)
+                        pci_bus_add_devices(bus);
+        }
 }
 
 
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 837c0fa58317..700686d04869 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -207,6 +207,9 @@ nautilus_init_pci(void)
 
         /* Scan our single hose.  */
         bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
+        if (!bus)
+                return;
+
         hose->bus = bus;
         pcibios_claim_one_bus(bus);
 
@@ -253,6 +256,7 @@ nautilus_init_pci(void)
            for the root bus, so just clear it. */
         bus->self = NULL;
         pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
+        pci_bus_add_devices(bus);
 }
 
 /*
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index 8a275f297522..91fe97144570 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -155,17 +155,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 static struct pci_bus __init *
 dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
-
-        if (nr < num_pcie_ports) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
+        if (nr >= num_pcie_ports) {
                 BUG();
+                return NULL;
         }
 
-        return bus;
+        return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                 &sys->resources);
 }
 
 static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index 445e553f4a28..097ea4cb1136 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -197,17 +197,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 static struct pci_bus __init *
 mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
-
-        if (nr < num_pcie_ports) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
+        if (nr >= num_pcie_ports) {
                 BUG();
+                return NULL;
         }
 
-        return bus;
+        return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                 &sys->resources);
 }
 
 static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 87a12d6930ff..b02f3947be51 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -540,37 +540,33 @@ void __init orion5x_pci_set_cardbus_mode(void)
 
 int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)
 {
-        int ret = 0;
-
         vga_base = ORION5X_PCIE_MEM_PHYS_BASE;
 
         if (nr == 0) {
                 orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr);
-                ret = pcie_setup(sys);
-        } else if (nr == 1 && !orion5x_pci_disabled) {
+                return pcie_setup(sys);
+        }
+
+        if (nr == 1 && !orion5x_pci_disabled) {
                 orion5x_pci_set_bus_nr(sys->busnr);
-                ret = pci_setup(sys);
+                return pci_setup(sys);
         }
 
-        return ret;
+        return 0;
 }
 
 struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
+        if (nr == 0)
+                return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                         &sys->resources);
 
-        if (nr == 0) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else if (nr == 1 && !orion5x_pci_disabled) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
-                BUG();
-        }
+        if (nr == 1 && !orion5x_pci_disabled)
+                return pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,
+                                         &sys->resources);
 
-        return bus;
+        BUG();
+        return NULL;
 }
 
 int __init orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index b073f4d771a5..f211839e2cae 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -316,6 +316,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 
 int __init pcibios_init(void)
 {
+        struct pci_bus *bus;
         struct pci_ops *dir = NULL;
         LIST_HEAD(resources);
 
@@ -383,12 +384,15 @@ int __init pcibios_init(void)
         printk("PCI: Probing PCI hardware\n");
         pci_add_resource(&resources, &pci_ioport_resource);
         pci_add_resource(&resources, &pci_iomem_resource);
-        pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);
+        bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);
 
         pcibios_irq_init();
         pcibios_fixup_irqs();
         pcibios_resource_survey();
+        if (!bus)
+                return 0;
 
+        pci_bus_add_devices(bus);
         return 0;
 }
 
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 0b5ce82d203d..1be65eb074ec 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
         if (bus == NULL) {
                 kfree(res);
                 kfree(controller);
+                return;
         }
+        pci_bus_add_devices(bus);
 }
 
 /*
diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
index df9679238b6d..821de928dc3f 100644
--- a/arch/m68k/coldfire/pci.c
+++ b/arch/m68k/coldfire/pci.c
@@ -313,12 +313,16 @@ static int __init mcf_pci_init(void)
         schedule_timeout(msecs_to_jiffies(200));
 
         rootbus = pci_scan_bus(0, &mcf_pci_ops, NULL);
+        if (!rootbus)
+                return -ENODEV;
+
         rootbus->resource[0] = &mcf_pci_io;
         rootbus->resource[1] = &mcf_pci_mem;
 
         pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);
         pci_bus_size_bridges(rootbus);
         pci_bus_assign_resources(rootbus);
+        pci_bus_add_devices(rootbus);
         return 0;
 }
 
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 48528fb81eff..ae838ed5fcf2 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -1382,6 +1382,10 @@ static int __init pcibios_init(void)
 
         /* Call common code to handle resource allocation */
         pcibios_resource_survey();
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+                if (hose->bus)
+                        pci_bus_add_devices(hose->bus);
+        }
 
         return 0;
 }
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 1bf60b127377..8bb13a4af68a 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -94,27 +94,29 @@ static void pcibios_scanbus(struct pci_controller *hose)
         pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset);
         bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
                                 &resources);
-        if (!bus)
-                pci_free_resource_list(&resources);
-
         hose->bus = bus;
 
         need_domain_info = need_domain_info || hose->index;
         hose->need_domain_info = need_domain_info;
-        if (bus) {
-                next_busno = bus->busn_res.end + 1;
-                /* Don't allow 8-bit bus number overflow inside the hose -
-                   reserve some space for bridges. */
-                if (next_busno > 224) {
-                        next_busno = 0;
-                        need_domain_info = 1;
-                }
 
-                if (!pci_has_flag(PCI_PROBE_ONLY)) {
-                        pci_bus_size_bridges(bus);
-                        pci_bus_assign_resources(bus);
-                }
+        if (!bus) {
+                pci_free_resource_list(&resources);
+                return;
+        }
+
+        next_busno = bus->busn_res.end + 1;
+        /* Don't allow 8-bit bus number overflow inside the hose -
+           reserve some space for bridges. */
+        if (next_busno > 224) {
+                next_busno = 0;
+                need_domain_info = 1;
+        }
+
+        if (!pci_has_flag(PCI_PROBE_ONLY)) {
+                pci_bus_size_bridges(bus);
+                pci_bus_assign_resources(bus);
         }
+        pci_bus_add_devices(bus);
 }
 
 #ifdef CONFIG_OF
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 613ca1e55b4b..3dfe2d31c67b 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -342,6 +342,7 @@ static int __init pcibios_init(void)
 {
         resource_size_t io_offset, mem_offset;
         LIST_HEAD(resources);
+        struct pci_bus *bus;
 
         ioport_resource.start   = 0xA0000000;
         ioport_resource.end     = 0xDFFFFFFF;
@@ -371,11 +372,14 @@ static int __init pcibios_init(void)
 
         pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset);
         pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset);
-        pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);
+        bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);
+        if (!bus)
+                return 0;
 
         pcibios_irq_init();
         pcibios_fixup_irqs();
         pcibios_resource_survey();
+        pci_bus_add_devices(bus);
         return 0;
 }
 
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index f0b85443e060..b2c76f64c530 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -780,8 +780,8 @@ static int zpci_scan_bus(struct zpci_dev *zdev)
                 zpci_cleanup_bus_resources(zdev);
                 return -EIO;
         }
-
         zdev->bus->max_bus_speed = zdev->max_bus_speed;
+        pci_bus_add_devices(zdev->bus);
         return 0;
 }
 
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 1bc09ee7948f..d5462b7bc514 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -58,20 +58,23 @@ static void pcibios_scanbus(struct pci_channel *hose)
 
         need_domain_info = need_domain_info || hose->index;
         hose->need_domain_info = need_domain_info;
-        if (bus) {
-                next_busno = bus->busn_res.end + 1;
-                /* Don't allow 8-bit bus number overflow inside the hose -
-                   reserve some space for bridges. */
-                if (next_busno > 224) {
-                        next_busno = 0;
-                        need_domain_info = 1;
-                }
 
-                pci_bus_size_bridges(bus);
-                pci_bus_assign_resources(bus);
-        } else {
+        if (!bus) {
                 pci_free_resource_list(&resources);
+                return;
+        }
+
+        next_busno = bus->busn_res.end + 1;
+        /* Don't allow 8-bit bus number overflow inside the hose -
+           reserve some space for bridges. */
+        if (next_busno > 224) {
+                next_busno = 0;
+                need_domain_info = 1;
         }
+
+        pci_bus_size_bridges(bus);
+        pci_bus_assign_resources(bus);
+        pci_bus_add_devices(bus);
 }
 
 /*
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index 899b7203a4e4..4371f72ff025 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -34,15 +34,17 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
 
         root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info,
                                      &resources);
-        if (root_bus) {
-                /* Setup IRQs of all devices using custom routines */
-                pci_fixup_irqs(pci_common_swizzle, info->map_irq);
-
-                /* Assign devices with resources */
-                pci_assign_unassigned_resources();
-        } else {
+        if (!root_bus) {
                 pci_free_resource_list(&resources);
+                return;
         }
+
+        /* Setup IRQs of all devices using custom routines */
+        pci_fixup_irqs(pci_common_swizzle, info->map_irq);
+
+        /* Assign devices with resources */
+        pci_assign_unassigned_resources();
+        pci_bus_add_devices(root_bus);
 }
 
 void pcibios_fixup_bus(struct pci_bus *pbus)
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 9ce5afe167ff..9e267cae683e 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -677,11 +677,10 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
         }
 
         pci_of_scan_bus(pbm, node, bus);
-        pci_bus_add_devices(bus);
         pci_bus_register_of_sysfs(bus);
 
         pci_claim_bus_resources(bus);
-
+        pci_bus_add_devices(bus);
         return bus;
 }
 
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 6cc78c213c01..24384e1dc33d 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -391,12 +391,16 @@ static void __init pcic_pbm_scan_bus(struct linux_pcic *pcic)
         struct linux_pbm_info *pbm = &pcic->pbm;
 
         pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno, &pcic_ops, pbm);
+        if (!pbm->pci_bus)
+                return;
+
 #if 0 /* deadwood transplanted from sparc64 */
         pci_fill_in_pbm_cookies(pbm->pci_bus, pbm, pbm->prom_node);
         pci_record_assignments(pbm, pbm->pci_bus);
         pci_assign_unassigned(pbm, pbm->pci_bus);
         pci_fixup_irq(pbm, pbm->pci_bus);
 #endif
+        pci_bus_add_devices(pbm->pci_bus);
 }
 
 /*
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 325df47f114d..9475a74cd53a 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -339,6 +339,8 @@ int __init pcibios_init(void)
                         struct pci_bus *next_bus;
                         struct pci_dev *dev;
 
+                        pci_bus_add_devices(root_bus);
+
                         list_for_each_entry(dev, &root_bus->devices, bus_list) {
                                 /*
                                  * Find the PCI host controller, ie. the 1st
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 2c95f37ebbed..b1df847d0686 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1030,6 +1030,8 @@ int __init pcibios_init(void)
 alloc_mem_map_failed:
                         break;
                 }
+
+                pci_bus_add_devices(root_bus);
         }
 
         return 0;
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index 374a055a8e6b..d45fa5f3e9c4 100644
--- a/arch/unicore32/kernel/pci.c
+++ b/arch/unicore32/kernel/pci.c
@@ -266,17 +266,10 @@ static int __init pci_common_init(void)
         pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
 
         if (!pci_has_flag(PCI_PROBE_ONLY)) {
-                /*
-                 * Size the bridge windows.
-                 */
                 pci_bus_size_bridges(puv3_bus);
-
-                /*
-                 * Assign resources.
-                 */
                 pci_bus_assign_resources(puv3_bus);
         }
-
+        pci_bus_add_devices(puv3_bus);
         return 0;
 }
 subsys_initcall(pci_common_init);
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 3d2612b68694..95a0ba70376b 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -490,7 +490,9 @@ void pcibios_scan_root(int busnum)
         if (!bus) {
                 pci_free_resource_list(&resources);
                 kfree(sd);
+                return;
         }
+        pci_bus_add_devices(bus);
 }
 
 void __init pcibios_set_cache_line_size(void)
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 5b3403388d7f..b848cc3dc913 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -174,7 +174,7 @@ static int __init pcibios_init(void)
         struct pci_controller *pci_ctrl;
         struct list_head resources;
         struct pci_bus *bus;
-        int next_busno = 0;
+        int next_busno = 0, ret;
 
         printk("PCI: Probing PCI hardware\n");
 
@@ -185,14 +185,25 @@ static int __init pcibios_init(void)
                 pci_controller_apertures(pci_ctrl, &resources);
                 bus = pci_scan_root_bus(NULL, pci_ctrl->first_busno,
                                         pci_ctrl->ops, pci_ctrl, &resources);
+                if (!bus)
+                        continue;
+
                 pci_ctrl->bus = bus;
                 pci_ctrl->last_busno = bus->busn_res.end;
                 if (next_busno <= pci_ctrl->last_busno)
                         next_busno = pci_ctrl->last_busno+1;
         }
         pci_bus_count = next_busno;
+        ret = platform_pcibios_fixup();
+        if (ret)
+                return ret;
 
-        return platform_pcibios_fixup();
+        for (pci_ctrl = pci_ctrl_head; pci_ctrl; pci_ctrl = pci_ctrl->next) {
+                if (pci_ctrl->bus)
+                        pci_bus_add_devices(pci_ctrl->bus);
+        }
+
+        return 0;
 }
 
 subsys_initcall(pcibios_init);