summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2011-10-28 16:26:52 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-01-06 12:11:01 -0800
commit4723b984b227f3fd466cd56cd18bc0110fff5987 (patch)
tree1de829a24d03a82221916d2b094a8ccc9be88b32 /arch/microblaze/pci
parent58de74b805312c7f5757cb654e9829bd9c1f3c69 (diff)
downloadop-kernel-dev-4723b984b227f3fd466cd56cd18bc0110fff5987.zip
op-kernel-dev-4723b984b227f3fd466cd56cd18bc0110fff5987.tar.gz
microblaze/PCI: use pci_scan_root_bus()
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>
Diffstat (limited to 'arch/microblaze/pci')
-rw-r--r--arch/microblaze/pci/pci-common.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index e0fdab3..016d420 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -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;
}
OpenPOWER on IntegriCloud