Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516Ab2BZXeD (ORCPT ); Sun, 26 Feb 2012 18:34:03 -0500 Received: from acsinet15.oracle.com ([141.146.126.227]:21168 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753422Ab2BZXdw (ORCPT ); Sun, 26 Feb 2012 18:33:52 -0500 From: Yinghai Lu To: Jesse Barnes Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 7/8] x86, PCI: break down get_current_resource() Date: Sun, 26 Feb 2012 15:33:21 -0800 Message-Id: <1330299202-3838-8-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1330299202-3838-1-git-send-email-yinghai@kernel.org> References: <1330299202-3838-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-CT-RefId: str=0001.0A090202.4F4AC15E.006F,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3332 Lines: 117 change it to probe_pci_root_info, aka only do one thing. 1. remove resource list head from pci_root_info 2. make get_current_resources() not pass resources move out add_resources calling out of yet. 3. rename get_current_resourcs name to probe_pci_root_info Signed-off-by: Yinghai Lu --- arch/x86/pci/acpi.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) Index: linux-2.6/arch/x86/pci/acpi.c =================================================================== --- linux-2.6.orig/arch/x86/pci/acpi.c +++ linux-2.6/arch/x86/pci/acpi.c @@ -12,7 +12,6 @@ struct pci_root_info { char *name; unsigned int res_num; struct resource *res; - struct list_head *resources; int busnum; }; @@ -277,7 +276,8 @@ static void coalesce_windows(struct pci_ } } -static void add_resources(struct pci_root_info *info) +static void add_resources(struct pci_root_info *info, + struct list_head *resources) { int i; struct resource *res, *root, *conflict; @@ -301,7 +301,7 @@ static void add_resources(struct pci_roo "ignoring host bridge window %pR (conflicts with %s %pR)\n", res, conflict->name, conflict); else - pci_add_resource(info->resources, res); + pci_add_resource(resources, res); } } @@ -313,41 +313,30 @@ static void free_pci_root_info(struct pc } static void -get_current_resources(struct pci_root_info *info, - struct acpi_device *device, int busnum, - int domain, struct list_head *resources) +probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, + int busnum, int domain) { size_t size; info->bridge = device; info->res_num = 0; - info->resources = resources; acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource, info); if (!info->res_num) return; size = sizeof(*info->res) * info->res_num; + info->res_num = 0; info->res = kmalloc(size, GFP_KERNEL); if (!info->res) return; info->name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum); if (!info->name) - goto name_alloc_fail; + return; - info->res_num = 0; acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource, info); - - if (pci_use_crs) { - add_resources(info); - - return; - } - -name_alloc_fail: - free_pci_root_info(info); } struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) @@ -412,15 +401,18 @@ struct pci_bus * __devinit pci_acpi_scan memcpy(bus->sysdata, sd, sizeof(*sd)); kfree(sd); } else { - get_current_resources(&info, device, busnum, domain, - &resources); + probe_pci_root_info(&info, device, busnum, domain); /* * _CRS with no apertures is normal, so only fall back to * defaults or native bridge info if we're ignoring _CRS. */ - if (!pci_use_crs) + if (pci_use_crs) + add_resources(&info, &resources); + else { + free_pci_root_info(&info); x86_pci_root_bus_resources(busnum, &resources); + } bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); if (bus) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/