Skip to content

Commit

Permalink
microblaze/PCI: use pci_scan_root_bus()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bjorn-helgaas authored and jbarnes993 committed Jan 6, 2012
1 parent 58de74b commit 4723b98
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions arch/microblaze/pci/pci-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand All @@ -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;
}
Expand Down

0 comments on commit 4723b98

Please sign in to comment.