From patchwork Fri Apr 3 09:26:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6155721 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 E960F9F1BE for ; Fri, 3 Apr 2015 10:00:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE2FB203E5 for ; Fri, 3 Apr 2015 10:00:47 +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 11F04203E1 for ; Fri, 3 Apr 2015 10:00:47 +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 1YdyM4-0000L7-7o; Fri, 03 Apr 2015 09:57:36 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydy1g-0005oG-2V for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 09:36:33 +0000 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BDZ43855; Fri, 03 Apr 2015 17:29:16 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 17:29:02 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v9 27/30] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Fri, 3 Apr 2015 17:26:01 +0800 Message-ID: <1428053164-28277-29-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> References: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.551E5D6D.0050, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: dab17fc6ec6be9229009aacb91927e20 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150403_023632_517948_86BA98D5 X-CRM114-Status: GOOD ( 11.98 ) 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 | 35 +++++++++-------------------------- include/linux/pci.h | 3 --- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 7796bf8..cb0237f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1852,7 +1852,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; @@ -1937,24 +1937,6 @@ put_dev: return NULL; } -struct pci_bus *pci_create_root_bus(struct device *parent, - int domain, int bus, struct pci_ops *ops, void *sysdata, - struct list_head *resources) -{ - struct pci_host_bridge *host; - - host = pci_create_host_bridge(parent, domain, bus, - sysdata, resources, NULL); - if (!host) - return NULL; - - host->bus = __pci_create_root_bus(host, ops); - if (!host->bus) - pci_free_host_bridge(host); - - return host->bus; -} - int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) { struct resource *res = &b->busn_res; @@ -2030,7 +2012,7 @@ static struct pci_bus *__pci_scan_root_bus( struct pci_bus *b; int max; - b = __pci_create_root_bus(host, ops); + b = pci_create_root_bus(host, ops); if (!b) return NULL; @@ -2093,19 +2075,20 @@ struct pci_bus *pci_scan_bus(int domain, int bus, struct pci_ops *ops, void *sysdata) { LIST_HEAD(resources); - struct pci_bus *b; + struct pci_host_bridge *host; 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, bus, ops, sysdata, - &resources); - if (b) { - pci_scan_child_bus(b); + host = pci_create_host_bridge(NULL, domain, bus, sysdata, + &resources, NULL); + if (host) { + __pci_scan_root_bus(host, ops); + return host->bus; } else { pci_free_resource_list(&resources); } - return b; + return NULL; } EXPORT_SYMBOL(pci_scan_bus); diff --git a/include/linux/pci.h b/include/linux/pci.h index 61e0853..62333ff 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -782,9 +782,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, int bus, - 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);