Enhance FRV architecture specific code to use hotplug-safe iterators to walk PCI buses.
Signed-off-by: Jiang Liu <[email protected]> Cc: David Howells <[email protected]> Cc: Jiang Liu <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Sebastian Andrzej Siewior <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: [email protected] --- arch/frv/mb93090-mb00/pci-frv.c | 5 ++++- arch/frv/mb93090-mb00/pci-vdk.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index c281217..48ee89a 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c @@ -188,8 +188,11 @@ static void __init pcibios_assign_resources(void) void __init pcibios_resource_survey(void) { + struct pci_bus *bus; + DBG("PCI: Allocating resources\n"); - pcibios_allocate_bus_resources(&pci_root_buses); + for_each_pci_root_bus(bus) + pcibios_allocate_bus_resources(&bus->children); pcibios_allocate_resources(0); pcibios_allocate_resources(1); pcibios_assign_resources(); diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index 0aa35f0..f1d6c16 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c @@ -234,7 +234,7 @@ static void __init pcibios_fixup_peer_bridges(void) return; printk("PCI: Peer bridge fixup\n"); for (n=0; n <= pcibios_last_bus; n++) { - if (pci_find_bus(0, n)) + if (pci_bus_exists(0, n)) continue; bus.number = n; bus.ops = pci_root_ops; -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
