From patchwork Sun Jan 27 19:23:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,10/22] PCI, x86: Kill pci_root_buses in resources reservations Date: Sun, 27 Jan 2013 09:23:37 -0000 From: Yinghai Lu X-Patchwork-Id: 216040 Message-Id: <1359314629-18651-11-git-send-email-yinghai@kernel.org> To: Bjorn Helgaas , Jiang Liu , "Rafael J. Wysocki" , Taku Izumi , Toshi Kani Cc: "Greg Kroah-Hartman" , linux-pci@vger.kernel.org, Yinghai Lu , x86@kernel.org Replace that with hotplug-safe version for iteration. Signed-off-by: Yinghai Lu Cc: x86@kernel.org --- arch/x86/pci/i386.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 94919e3..b13e0af 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -340,11 +340,11 @@ static void pcibios_allocate_rom_resources(struct pci_bus *bus) static int __init pcibios_assign_resources(void) { - struct pci_bus *bus; + struct pci_host_bridge *host_bridge = NULL; if (!(pci_probe & PCI_ASSIGN_ROMS)) - list_for_each_entry(bus, &pci_root_buses, node) - pcibios_allocate_rom_resources(bus); + for_each_pci_host_bridge(host_bridge) + pcibios_allocate_rom_resources(host_bridge->bus); pci_assign_unassigned_resources(); pcibios_fw_addr_list_del(); @@ -367,17 +367,17 @@ void pcibios_resource_survey_bus(struct pci_bus *bus) void __init pcibios_resource_survey(void) { - struct pci_bus *bus; + struct pci_host_bridge *host_bridge = NULL; DBG("PCI: Allocating resources\n"); - list_for_each_entry(bus, &pci_root_buses, node) - pcibios_allocate_bus_resources(bus); + for_each_pci_host_bridge(host_bridge) + pcibios_allocate_bus_resources(host_bridge->bus); - list_for_each_entry(bus, &pci_root_buses, node) - pcibios_allocate_resources(bus, 0); - list_for_each_entry(bus, &pci_root_buses, node) - pcibios_allocate_resources(bus, 1); + for_each_pci_host_bridge(host_bridge) + pcibios_allocate_resources(host_bridge->bus, 0); + for_each_pci_host_bridge(host_bridge) + pcibios_allocate_resources(host_bridge->bus, 1); e820_reserve_resources_late(); /*