From patchwork Tue Sep 25 08:26:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 1502921 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CA47ADF28C for ; Tue, 25 Sep 2012 08:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918Ab2IYI0x (ORCPT ); Tue, 25 Sep 2012 04:26:53 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:42836 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753894Ab2IYI0r (ORCPT ); Tue, 25 Sep 2012 04:26:47 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q8P8Qfx9020183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Sep 2012 08:26:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q8P8QfF6013709 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Sep 2012 08:26:41 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q8P8QeI0002432; Tue, 25 Sep 2012 03:26:40 -0500 Received: from linux-siqj.site (/75.36.245.102) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 25 Sep 2012 01:26:40 -0700 From: Yinghai Lu To: Bjorn Helgaas , Len Brown Cc: linux-pci@vger.kernel.org, Yinghai Lu , x86@kernel.org Subject: [PATCH 17/29] PCI, x86: kill pci_root_buses in resources reservations Date: Tue, 25 Sep 2012 01:26:18 -0700 Message-Id: <1348561590-28067-18-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1348561590-28067-1-git-send-email-yinghai@kernel.org> References: <1348561590-28067-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Signed-off-by: Yinghai Lu Cc: x86@kernel.org --- arch/x86/pci/i386.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 42dd755..c5055b8 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -332,11 +332,11 @@ static void __init 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(); @@ -346,17 +346,17 @@ static int __init pcibios_assign_resources(void) 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(); /*