From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbbCWMqE (ORCPT ); Mon, 23 Mar 2015 08:46:04 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:37123 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbbCWMp5 (ORCPT ); Mon, 23 Mar 2015 08:45:57 -0400 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" Subject: [PATCH v7 27/31] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Mon, 23 Mar 2015 20:40:53 +0800 Message-ID: <1427114457-16687-28-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.55100AA1.0290,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: 089ca113ca9d007f4519c02ee7e329c8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: [PATCH v7 27/31] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Mon, 23 Mar 2015 20:40:53 +0800 Message-ID: <1427114457-16687-28-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Bjorn Helgaas Cc: Jiang Liu , linux-pci@vger.kernel.org, Yinghai Lu , linux-kernel@vger.kernel.org, Marc Zyngier , linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , Guan Xuetao , linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Yijing Wang 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); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga03-in.huawei.com ([119.145.14.66]:37123 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbbCWMp5 (ORCPT ); Mon, 23 Mar 2015 08:45:57 -0400 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" Subject: [PATCH v7 27/31] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Date: Mon, 23 Mar 2015 20:40:53 +0800 Message-ID: <1427114457-16687-28-git-send-email-wangyijing@huawei.com> In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-pci-owner@vger.kernel.org List-ID: 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); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: wangyijing@huawei.com (Yijing Wang) Date: Mon, 23 Mar 2015 20:40:53 +0800 Subject: [PATCH v7 27/31] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> Message-ID: <1427114457-16687-28-git-send-email-wangyijing@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 at 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); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Mon, 23 Mar 2015 12:40:53 +0000 Subject: [PATCH v7 27/31] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Message-Id: <1427114457-16687-28-git-send-email-wangyijing@huawei.com> List-Id: References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: Jiang Liu , linux-pci@vger.kernel.org, Yinghai Lu , linux-kernel@vger.kernel.org, Marc Zyngier , linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , Guan Xuetao , linux-alpha@vger.kernel.org, linux-m68k@vger.kernel.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Yijing Wang 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); -- 1.7.1