From patchwork Mon Mar 9 02:34:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5963651 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82377BF440 for ; Mon, 9 Mar 2015 02:46:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37064202EB for ; Mon, 9 Mar 2015 02:46:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 184312025A for ; Mon, 9 Mar 2015 02:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753464AbbCICne (ORCPT ); Sun, 8 Mar 2015 22:43:34 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:22623 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753397AbbCICnZ (ORCPT ); Sun, 8 Mar 2015 22:43:25 -0400 Received: from 172.24.2.119 (EHLO szxeml433-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BCT82393; Mon, 09 Mar 2015 10:43:21 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.158.1; Mon, 9 Mar 2015 10:43:09 +0800 From: Yijing Wang To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Yijing Wang" , Bjorn Helgaas Subject: [PATCH v6 27/30] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Mon, 9 Mar 2015 10:34:24 +0800 Message-ID: <1425868467-9667-28-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1425868467-9667-1-git-send-email-wangyijing@huawei.com> References: <1425868467-9667-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.0A010203.54FD08C9.0166, 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: e6efd298708163c0a6f2c6ace77e6152 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Signed-off-by: Bjorn Helgaas --- drivers/pci/probe.c | 27 ++++++++------------------- include/linux/pci.h | 3 --- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 1080eff..196f08a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1853,7 +1853,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,18 +1937,6 @@ err_out: return NULL; } -struct pci_bus *pci_create_root_bus(struct device *parent, u32 db, - struct pci_ops *ops, void *sysdata, struct list_head *resources) -{ - struct pci_host_bridge *host; - - host = pci_create_host_bridge(parent, db, resources, sysdata, NULL); - if (!host) - return NULL; - - return __pci_create_root_bus(host, ops); -} - int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) { struct resource *res = &b->busn_res; @@ -2026,7 +2014,7 @@ static struct pci_bus *__pci_scan_root_bus( break; } - b = __pci_create_root_bus(host, ops); + b = pci_create_root_bus(host, ops); if (!b) { pci_free_host_bridge(host); return NULL; @@ -2089,18 +2077,19 @@ struct pci_bus *pci_scan_bus(u32 db, 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, db, ops, sysdata, &resources); - if (b) { - pci_scan_child_bus(b); + host = pci_create_host_bridge(NULL, db, 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 261b8de..5717b14 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -779,9 +779,6 @@ void pcibios_scan_specific_bus(int busn); 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(u32 dombus, struct pci_ops *ops, void *sysdata); -struct pci_bus *pci_create_root_bus(struct device *parent, u32 dombus, - 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);