[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120626033212.16434.95081.stgit@amt.stowe>
Date: Mon, 25 Jun 2012 21:32:12 -0600
From: Myron Stowe <myron.stowe@...hat.com>
To: bhelgaas@...gle.com
Cc: linux-pci@...r.kernel.org, rth@...ddle.net,
ink@...assic.park.msu.ru, mattst88@...il.com,
linux@....linux.org.uk, starvik@...s.com, jesper.nilsson@...s.com,
tony.luck@...el.com, fenghua.yu@...el.com, monstr@...str.eu,
ralf@...ux-mips.org, yasutake.koichi@...panasonic.com,
jejb@...isc-linux.org, deller@....de, benh@...nel.crashing.org,
paulus@...ba.org, lethal@...ux-sh.org, davem@...emloft.net,
cmetcalf@...era.com, gxt@...c.pku.edu.cn, tglx@...utronix.de,
mingo@...hat.com, hpa@...or.com, x86@...nel.org, chris@...kel.net,
linux-kernel@...r.kernel.org
Subject: [PATCH 11/16] sparc/PCI: Factor 'pcibios_setup()' out of sparc
The PCI core provides a generic (__weak) 'pcibios_setup()' routine
that can be used by all architectures as a default. Drop sparc's
architecture specific version in favor of that as it does not need to be
over-ridden.
Signed-off-by: Myron Stowe <myron.stowe@...hat.com>
---
arch/sparc/kernel/leon_pci.c | 8 --------
arch/sparc/kernel/pci.c | 5 -----
arch/sparc/kernel/pcic.c | 8 --------
3 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index 19f5605..21dcda7 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -91,14 +91,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
}
}
-/*
- * Other archs parse arguments here.
- */
-char * __devinit pcibios_setup(char *str)
-{
- return str;
-}
-
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index fdaf218..3e7fba0 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -747,11 +747,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return 0;
}
-char * __devinit pcibios_setup(char *str)
-{
- return str;
-}
-
/* Platform support for /proc/bus/pci/X/Y mmap()s. */
/* If the user uses a host-bridge as the PCI device, he may use
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index ded3f60..97eb529 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -767,14 +767,6 @@ static void watchdog_reset() {
}
#endif
-/*
- * Other archs parse arguments here.
- */
-char * __devinit pcibios_setup(char *str)
-{
- return str;
-}
-
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists