Patchwork [09/16] sh/PCI: Factor 'pcibios_setup()' out of sh

login
register
mail settings
Submitter Myron Stowe
Date June 26, 2012, 3:31 a.m.
Message ID <20120626033158.16434.94698.stgit@amt.stowe>
Download mbox | patch
Permalink /patch/167304/
State Accepted
Headers show

Comments

Myron Stowe - June 26, 2012, 3:31 a.m.
The PCI core provides a generic (__weak) 'pcibios_setup()' routine that can
be used by all architectures as a default.  Drop sh's architecture specific
version in favor of that as it does not need to be over-ridden.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
---

 arch/sh/drivers/pci/pci.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nobuhiro Iwamatsu - June 26, 2012, 4:57 a.m.
2012/6/26 Myron Stowe <myron.stowe@redhat.com>:
> The PCI core provides a generic (__weak) 'pcibios_setup()' routine that can
> be used by all architectures as a default.  Drop sh's architecture specific
> version in favor of that as it does not need to be over-ridden.
>
> Signed-off-by: Myron Stowe <myron.stowe@redhat.com>

Tested-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Paul Mundt - June 26, 2012, 5:51 a.m.
On Mon, Jun 25, 2012 at 09:31:58PM -0600, Myron Stowe wrote:
> The PCI core provides a generic (__weak) 'pcibios_setup()' routine that can
> be used by all architectures as a default.  Drop sh's architecture specific
> version in favor of that as it does not need to be over-ridden.
> 
> Signed-off-by: Myron Stowe <myron.stowe@redhat.com>

Acked-by: Paul Mundt <lethal@linux-sh.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 9d10a3c..7d42288 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -197,11 +197,6 @@  void __init pcibios_update_irq(struct pci_dev *dev, int irq)
 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
 
-char * __devinit __weak pcibios_setup(char *str)
-{
-	return str;
-}
-
 static void __init
 pcibios_bus_report_status_early(struct pci_channel *hose,
 				int top_bus, int current_bus,