From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755358AbbAUCi1 (ORCPT ); Tue, 20 Jan 2015 21:38:27 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:2952 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751720AbbAUCcm (ORCPT ); Tue, 20 Jan 2015 21:32:42 -0500 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 v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() Date: Wed, 21 Jan 2015 08:30:14 +0800 Message-ID: <1421800225-26230-20-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> References: <1421800225-26230-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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now no one use weak pcibios_root_bridge_prepare(), we could remove it. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 15 --------------- include/linux/pci.h | 2 -- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c23ca8a..79b5aca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,18 +1844,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_scan_child_bus); -/** - * pcibios_root_bridge_prepare - Platform-specific host bridge setup. - * @bridge: Host bridge to set up. - * - * Default empty implementation. Replace with an architecture-specific setup - * routine, if necessary. - */ -int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - return 0; -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1890,9 +1878,6 @@ static struct pci_bus *__pci_create_root_bus( b->bridge = get_device(&bridge->dev); if (bridge->ops && bridge->ops->phb_set_root_bus_speed) bridge->ops->phb_set_root_bus_speed(bridge); - error = pcibios_root_bridge_prepare(bridge); - if (error) - goto err_out; device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); diff --git a/include/linux/pci.h b/include/linux/pci.h index e60c59a..e81cd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,8 +424,6 @@ struct pci_host_bridge { void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); - -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( struct device *parent, u32 dombus, struct list_head *resources, void *sysdata, struct pci_host_bridge_ops *ops); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: [PATCH v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() Date: Wed, 21 Jan 2015 08:30:14 +0800 Message-ID: <1421800225-26230-20-git-send-email-wangyijing@huawei.com> References: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1421800225-26230-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 weak pcibios_root_bridge_prepare(), we could remove it. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 15 --------------- include/linux/pci.h | 2 -- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c23ca8a..79b5aca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,18 +1844,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_scan_child_bus); -/** - * pcibios_root_bridge_prepare - Platform-specific host bridge setup. - * @bridge: Host bridge to set up. - * - * Default empty implementation. Replace with an architecture-specific setup - * routine, if necessary. - */ -int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - return 0; -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1890,9 +1878,6 @@ static struct pci_bus *__pci_create_root_bus( b->bridge = get_device(&bridge->dev); if (bridge->ops && bridge->ops->phb_set_root_bus_speed) bridge->ops->phb_set_root_bus_speed(bridge); - error = pcibios_root_bridge_prepare(bridge); - if (error) - goto err_out; device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); diff --git a/include/linux/pci.h b/include/linux/pci.h index e60c59a..e81cd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,8 +424,6 @@ struct pci_host_bridge { void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); - -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( struct device *parent, u32 dombus, struct list_head *resources, void *sysdata, struct pci_host_bridge_ops *ops); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com ([119.145.14.65]:2952 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751720AbbAUCcm (ORCPT ); Tue, 20 Jan 2015 21:32:42 -0500 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 v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() Date: Wed, 21 Jan 2015 08:30:14 +0800 Message-ID: <1421800225-26230-20-git-send-email-wangyijing@huawei.com> In-Reply-To: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> References: <1421800225-26230-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 weak pcibios_root_bridge_prepare(), we could remove it. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 15 --------------- include/linux/pci.h | 2 -- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c23ca8a..79b5aca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,18 +1844,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_scan_child_bus); -/** - * pcibios_root_bridge_prepare - Platform-specific host bridge setup. - * @bridge: Host bridge to set up. - * - * Default empty implementation. Replace with an architecture-specific setup - * routine, if necessary. - */ -int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - return 0; -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1890,9 +1878,6 @@ static struct pci_bus *__pci_create_root_bus( b->bridge = get_device(&bridge->dev); if (bridge->ops && bridge->ops->phb_set_root_bus_speed) bridge->ops->phb_set_root_bus_speed(bridge); - error = pcibios_root_bridge_prepare(bridge); - if (error) - goto err_out; device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); diff --git a/include/linux/pci.h b/include/linux/pci.h index e60c59a..e81cd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,8 +424,6 @@ struct pci_host_bridge { void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); - -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( struct device *parent, u32 dombus, struct list_head *resources, void *sysdata, struct pci_host_bridge_ops *ops); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: wangyijing@huawei.com (Yijing Wang) Date: Wed, 21 Jan 2015 08:30:14 +0800 Subject: [PATCH v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() In-Reply-To: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> References: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> Message-ID: <1421800225-26230-20-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 weak pcibios_root_bridge_prepare(), we could remove it. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 15 --------------- include/linux/pci.h | 2 -- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c23ca8a..79b5aca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,18 +1844,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_scan_child_bus); -/** - * pcibios_root_bridge_prepare - Platform-specific host bridge setup. - * @bridge: Host bridge to set up. - * - * Default empty implementation. Replace with an architecture-specific setup - * routine, if necessary. - */ -int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - return 0; -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1890,9 +1878,6 @@ static struct pci_bus *__pci_create_root_bus( b->bridge = get_device(&bridge->dev); if (bridge->ops && bridge->ops->phb_set_root_bus_speed) bridge->ops->phb_set_root_bus_speed(bridge); - error = pcibios_root_bridge_prepare(bridge); - if (error) - goto err_out; device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); diff --git a/include/linux/pci.h b/include/linux/pci.h index e60c59a..e81cd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,8 +424,6 @@ struct pci_host_bridge { void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); - -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( struct device *parent, u32 dombus, struct list_head *resources, void *sysdata, struct pci_host_bridge_ops *ops); -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Wed, 21 Jan 2015 00:30:14 +0000 Subject: [PATCH v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() Message-Id: <1421800225-26230-20-git-send-email-wangyijing@huawei.com> List-Id: References: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> In-Reply-To: <1421800225-26230-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 weak pcibios_root_bridge_prepare(), we could remove it. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 15 --------------- include/linux/pci.h | 2 -- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c23ca8a..79b5aca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,18 +1844,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_scan_child_bus); -/** - * pcibios_root_bridge_prepare - Platform-specific host bridge setup. - * @bridge: Host bridge to set up. - * - * Default empty implementation. Replace with an architecture-specific setup - * routine, if necessary. - */ -int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - return 0; -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1890,9 +1878,6 @@ static struct pci_bus *__pci_create_root_bus( b->bridge = get_device(&bridge->dev); if (bridge->ops && bridge->ops->phb_set_root_bus_speed) bridge->ops->phb_set_root_bus_speed(bridge); - error = pcibios_root_bridge_prepare(bridge); - if (error) - goto err_out; device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); diff --git a/include/linux/pci.h b/include/linux/pci.h index e60c59a..e81cd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,8 +424,6 @@ struct pci_host_bridge { void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); - -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( struct device *parent, u32 dombus, struct list_head *resources, void *sysdata, struct pci_host_bridge_ops *ops); -- 1.7.1