From patchwork Tue Apr 21 11:34:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6247351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 93FAA9F32B for ; Tue, 21 Apr 2015 11:46:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6185D202B4 for ; Tue, 21 Apr 2015 11:46:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F0BD202AE for ; Tue, 21 Apr 2015 11:46:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkWa2-0001BO-Rz; Tue, 21 Apr 2015 11:43:06 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkWXJ-0006qH-Vd for linux-arm-kernel@lists.infradead.org; Tue, 21 Apr 2015 11:40:19 +0000 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CKC39784; Tue, 21 Apr 2015 19:38:25 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.158.1; Tue, 21 Apr 2015 19:38:18 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v10 27/29] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Tue, 21 Apr 2015 19:34:46 +0800 Message-ID: <1429616088-10249-28-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1429616088-10249-1-git-send-email-wangyijing@huawei.com> References: <1429616088-10249-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150421_044018_435209_556E5A9B X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -2.3 (--) Cc: linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , Arnd Bergmann , Marc Zyngier , Rusty Russell , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, dja@axtens.net, Liviu Dudau , Tony Luck , linux-kernel@vger.kernel.org, Jiang Liu , linux-alpha@vger.kernel.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now no one use pci_create_root_bus(), we could remove it and rename __pci_create_root_bus() to pci_create_root_bus(). Signed-off-by: wangyijing@huawei.com --- drivers/pci/probe.c | 57 +++++++++++++++----------------------------------- include/linux/pci.h | 3 -- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 2ba6754..c9bee34 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1858,7 +1858,7 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) { } -static struct pci_bus *__pci_create_root_bus( +static struct pci_bus *pci_create_root_bus( struct pci_host_bridge *bridge, struct pci_ops *ops) { int error, bus; @@ -1947,34 +1947,6 @@ put_bridge: } EXPORT_SYMBOL_GPL(pci_create_root_bus); -struct pci_bus *pci_create_root_bus(struct device *parent, - int domain, struct pci_ops *ops, void *sysdata, - struct list_head *resources) -{ - struct resource_entry *busn_res; - struct pci_host_bridge *host; - - busn_res = pci_busn_resource(resources); - if (!busn_res) { - pr_err("No busn resource found\n"); - return NULL; - } - - host = pci_create_host_bridge(parent, domain, sysdata, - resources, NULL); - if (!host) - return NULL; - - host->bus = __pci_create_root_bus(host, ops); - if (!host->bus) { - pci_free_host_bridge(host); - return NULL; - } - - return host->bus; -} - - int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) { struct resource *res = &b->busn_res; @@ -2060,7 +2032,7 @@ struct pci_host_bridge *pci_scan_host_bridge( if (!host) return NULL; - host->bus = __pci_create_root_bus(host, ops->pci_ops); + host->bus = pci_create_root_bus(host, ops->pci_ops); if (!host->bus) { pci_free_host_bridge(host); return NULL; @@ -2104,7 +2076,7 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, if (busn_resource) host->dynamic_busn = true; - host->bus = __pci_create_root_bus(host, ops); + host->bus = pci_create_root_bus(host, ops); if (!host->bus) { pci_free_host_bridge(host); return NULL; @@ -2123,7 +2095,6 @@ struct pci_bus *pci_scan_bus(int domain, int bus, struct pci_ops *ops, void *sysdata) { LIST_HEAD(resources); - struct pci_bus *b; struct resource *busn_resource; struct pci_host_bridge *host; @@ -2137,17 +2108,23 @@ struct pci_bus *pci_scan_bus(int domain, int bus, pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); pci_add_resource(&resources, busn_resource); - b = pci_create_root_bus(NULL, domain, ops, sysdata, - &resources); - if (b) { - host = to_pci_host_bridge(b->bridge); - host->dynamic_busn = true; - pci_scan_child_bus(b); - } else { + host = pci_create_host_bridge(NULL, domain, sysdata, + &resources, NULL); + if (!host) { kfree(busn_resource); pci_free_resource_list(&resources); + return NULL; } - return b; + + host->dynamic_busn = true; + host->bus = pci_create_root_bus(host, ops); + if (!host->bus) { + pci_free_host_bridge(host); + return NULL; + } + + pci_scan_child_bus(host->bus); + return host->bus; } EXPORT_SYMBOL(pci_scan_bus); diff --git a/include/linux/pci.h b/include/linux/pci.h index 41eb672..7a9bd2d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -785,9 +785,6 @@ struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); struct pci_bus *pci_scan_bus(int domain, int bus, struct pci_ops *ops, void *sysdata); -struct pci_bus *pci_create_root_bus(struct device *parent, int domain, - struct pci_ops *ops, void *sysdata, - struct list_head *resources); int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax); int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax); void pci_bus_release_busn_res(struct pci_bus *b);