microblaze/PCI: use pci_scan_root_bus()
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Oct 2011 22:26:52 +0000 (16:26 -0600)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 6 Jan 2012 20:11:01 +0000 (12:11 -0800)
Microblaze doesn't need to replace pci_scan_child_bus() or do anything
special before pci_bus_add_devices(), so we can use the more generic PCI
path in pci_scan_root_bus().

CC: Michal Simek <monstr@monstr.eu>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
arch/microblaze/pci/pci-common.c

index e0fdab323ec54fbd83f82a3dd5c64c98cb3bf015..016d420f0ec735319f9eede27fb4f3431b114c22 100644 (file)
@@ -1590,9 +1590,8 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose)
 
        pcibios_setup_phb_resources(hose, &resources);
 
-       /* Create an empty bus for the toplevel */
-       bus = pci_create_root_bus(hose->parent, hose->first_busno, hose->ops,
-                                 hose, &resources);
+       bus = pci_scan_root_bus(hose->parent, hose->first_busno,
+                               hose->ops, hose, &resources);
        if (bus == NULL) {
                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
                       hose->global_number);
@@ -1602,8 +1601,7 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose)
        bus->secondary = hose->first_busno;
        hose->bus = bus;
 
-       /* Scan children */
-       hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
+       hose->last_busno = bus->subordinate;
 }
 
 static int __init pcibios_init(void)
@@ -1617,8 +1615,6 @@ static int __init pcibios_init(void)
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                hose->last_busno = 0xff;
                pcibios_scan_phb(hose);
-               printk(KERN_INFO "calling pci_bus_add_devices()\n");
-               pci_bus_add_devices(hose->bus);
                if (next_busno <= hose->last_busno)
                        next_busno = hose->last_busno + 1;
        }