Replace iterating over pci_root_buses with the official pci_find_next_bus() call provided by PCI core. This allows to make pci_root_buses private to PCI core.
Signed-off-by: Gerd Bayer <[email protected]> --- arch/powerpc/kernel/pci-common.c | 7 ++++--- arch/powerpc/kernel/pci_64.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 8efe95a0c4ff..1e0be7bcaa56 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1417,10 +1417,10 @@ static void __init pcibios_reserve_legacy_regions(struct pci_bus *bus) void __init pcibios_resource_survey(void) { - struct pci_bus *b; + struct pci_bus *b = NULL; /* Allocate and assign resources */ - list_for_each_entry(b, &pci_root_buses, node) + while ((b = pci_find_next_bus(b)) != NULL) pcibios_allocate_bus_resources(b); if (!pci_has_flag(PCI_REASSIGN_ALL_RSRC)) { pcibios_allocate_resources(0); @@ -1432,7 +1432,8 @@ void __init pcibios_resource_survey(void) * bus available resources to avoid allocating things on top of them */ if (!pci_has_flag(PCI_PROBE_ONLY)) { - list_for_each_entry(b, &pci_root_buses, node) + b = NULL; /* Start all over */ + while ((b = pci_find_next_bus(b)) != NULL) pcibios_reserve_legacy_regions(b); } diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index e27342ef128b..f816d063b984 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c @@ -227,7 +227,7 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus, unsigned long, in_devfn) { struct pci_controller* hose; - struct pci_bus *tmp_bus, *bus = NULL; + struct pci_bus *tmp_bus = NULL, *bus = NULL; struct device_node *hose_node; /* Argh ! Please forgive me for that hack, but that's the @@ -248,7 +248,7 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus, * used on pre-domains setup. We return the first match */ - list_for_each_entry(tmp_bus, &pci_root_buses, node) { + while ((tmp_bus = pci_find_next_bus(tmp_bus)) != NULL) { if (in_bus >= tmp_bus->number && in_bus <= tmp_bus->busn_res.end) { bus = tmp_bus; -- 2.54.0
