From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891AbbCWMoi (ORCPT ); Mon, 23 Mar 2015 08:44:38 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:35958 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbCWMoM (ORCPT ); Mon, 23 Mar 2015 08:44:12 -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 20/31] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Date: Mon, 23 Mar 2015 20:40:46 +0800 Message-ID: <1427114457-16687-21-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.0A020201.55100A97.0108,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: d753e97d3a015b0f621efbfbdb361234 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() and pcibios_set_root_bus_speed, we could clean up them. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 ---- drivers/pci/probe.c | 18 +----------------- include/linux/pci.h | 2 -- 3 files changed, 1 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index b439264..919ba4d 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -110,10 +110,6 @@ struct pci_host_bridge *pci_create_host_bridge( goto list_del; } - error = pcibios_root_bridge_prepare(host); - if (error) - goto list_del; - error = device_register(&host->dev); if (error) { put_device(&host->dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b3d9b1b..7796bf8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,22 +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_set_root_bus_speed(struct pci_host_bridge *bridge) -{ -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1896,7 +1880,7 @@ static struct pci_bus *__pci_create_root_bus( if (bridge->ops && bridge->ops->set_root_bus_speed) bridge->ops->set_root_bus_speed(bridge); - pcibios_set_root_bus_speed(bridge); + 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 0b921d6..61e0853 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -426,8 +426,6 @@ 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); - /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- 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]:35958 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbCWMoM (ORCPT ); Mon, 23 Mar 2015 08:44:12 -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 20/31] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Date: Mon, 23 Mar 2015 20:40:46 +0800 Message-ID: <1427114457-16687-21-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 weak pcibios_root_bridge_prepare() and pcibios_set_root_bus_speed, we could clean up them. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 ---- drivers/pci/probe.c | 18 +----------------- include/linux/pci.h | 2 -- 3 files changed, 1 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index b439264..919ba4d 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -110,10 +110,6 @@ struct pci_host_bridge *pci_create_host_bridge( goto list_del; } - error = pcibios_root_bridge_prepare(host); - if (error) - goto list_del; - error = device_register(&host->dev); if (error) { put_device(&host->dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b3d9b1b..7796bf8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,22 +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_set_root_bus_speed(struct pci_host_bridge *bridge) -{ -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1896,7 +1880,7 @@ static struct pci_bus *__pci_create_root_bus( if (bridge->ops && bridge->ops->set_root_bus_speed) bridge->ops->set_root_bus_speed(bridge); - pcibios_set_root_bus_speed(bridge); + 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 0b921d6..61e0853 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -426,8 +426,6 @@ 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); - /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- 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:46 +0800 Subject: [PATCH v7 20/31] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() 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-21-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() and pcibios_set_root_bus_speed, we could clean up them. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 ---- drivers/pci/probe.c | 18 +----------------- include/linux/pci.h | 2 -- 3 files changed, 1 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index b439264..919ba4d 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -110,10 +110,6 @@ struct pci_host_bridge *pci_create_host_bridge( goto list_del; } - error = pcibios_root_bridge_prepare(host); - if (error) - goto list_del; - error = device_register(&host->dev); if (error) { put_device(&host->dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b3d9b1b..7796bf8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,22 +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_set_root_bus_speed(struct pci_host_bridge *bridge) -{ -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1896,7 +1880,7 @@ static struct pci_bus *__pci_create_root_bus( if (bridge->ops && bridge->ops->set_root_bus_speed) bridge->ops->set_root_bus_speed(bridge); - pcibios_set_root_bus_speed(bridge); + 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 0b921d6..61e0853 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -426,8 +426,6 @@ 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); - /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Mon, 23 Mar 2015 12:40:46 +0000 Subject: [PATCH v7 20/31] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Message-Id: <1427114457-16687-21-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 weak pcibios_root_bridge_prepare() and pcibios_set_root_bus_speed, we could clean up them. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 ---- drivers/pci/probe.c | 18 +----------------- include/linux/pci.h | 2 -- 3 files changed, 1 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index b439264..919ba4d 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -110,10 +110,6 @@ struct pci_host_bridge *pci_create_host_bridge( goto list_del; } - error = pcibios_root_bridge_prepare(host); - if (error) - goto list_del; - error = device_register(&host->dev); if (error) { put_device(&host->dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b3d9b1b..7796bf8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,22 +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_set_root_bus_speed(struct pci_host_bridge *bridge) -{ -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1896,7 +1880,7 @@ static struct pci_bus *__pci_create_root_bus( if (bridge->ops && bridge->ops->set_root_bus_speed) bridge->ops->set_root_bus_speed(bridge); - pcibios_set_root_bus_speed(bridge); + 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 0b921d6..61e0853 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -426,8 +426,6 @@ 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); - /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: [PATCH v7 20/31] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Date: Mon, 23 Mar 2015 20:40:46 +0800 Message-ID: <1427114457-16687-21-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> Mime-Version: 1.0 Return-path: In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 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@lists.linux-m68k.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Yijing Wang Now no one use weak pcibios_root_bridge_prepare() and pcibios_set_root_bus_speed, we could clean up them. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 ---- drivers/pci/probe.c | 18 +----------------- include/linux/pci.h | 2 -- 3 files changed, 1 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index b439264..919ba4d 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -110,10 +110,6 @@ struct pci_host_bridge *pci_create_host_bridge( goto list_del; } - error = pcibios_root_bridge_prepare(host); - if (error) - goto list_del; - error = device_register(&host->dev); if (error) { put_device(&host->dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b3d9b1b..7796bf8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1844,22 +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_set_root_bus_speed(struct pci_host_bridge *bridge) -{ -} - void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1896,7 +1880,7 @@ static struct pci_bus *__pci_create_root_bus( if (bridge->ops && bridge->ops->set_root_bus_speed) bridge->ops->set_root_bus_speed(bridge); - pcibios_set_root_bus_speed(bridge); + 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 0b921d6..61e0853 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -426,8 +426,6 @@ 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); - /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- 1.7.1