aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-06-25 23:32:12 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-07-05 17:09:13 -0400
commitc53a25543e69d23caf2514c3ce3e734e0a68f4e9 (patch)
tree002323758ec1dd8321cc5b402cb90a1cb05aca53 /arch/sparc
parentce8dd71ad7cb9480d6003473630f0fbc4d67af71 (diff)
sparc/PCI: factor out pcibios_setup()
The PCI core provides a generic pcibios_setup() routine. Drop this architecture-specific version in favor of that. Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/leon_pci.c8
-rw-r--r--arch/sparc/kernel/pci.c5
-rw-r--r--arch/sparc/kernel/pcic.c8
3 files changed, 0 insertions, 21 deletions
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index 19f56058742b..21dcda75a520 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)
91 } 91 }
92} 92}
93 93
94/*
95 * Other archs parse arguments here.
96 */
97char * __devinit pcibios_setup(char *str)
98{
99 return str;
100}
101
102resource_size_t pcibios_align_resource(void *data, const struct resource *res, 94resource_size_t pcibios_align_resource(void *data, const struct resource *res,
103 resource_size_t size, resource_size_t align) 95 resource_size_t size, resource_size_t align)
104{ 96{
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index fdaf21811670..3e7fba0a5583 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)
747 return 0; 747 return 0;
748} 748}
749 749
750char * __devinit pcibios_setup(char *str)
751{
752 return str;
753}
754
755/* Platform support for /proc/bus/pci/X/Y mmap()s. */ 750/* Platform support for /proc/bus/pci/X/Y mmap()s. */
756 751
757/* If the user uses a host-bridge as the PCI device, he may use 752/* 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 ded3f6090c3f..97eb52937b82 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -767,14 +767,6 @@ static void watchdog_reset() {
767} 767}
768#endif 768#endif
769 769
770/*
771 * Other archs parse arguments here.
772 */
773char * __devinit pcibios_setup(char *str)
774{
775 return str;
776}
777
778resource_size_t pcibios_align_resource(void *data, const struct resource *res, 770resource_size_t pcibios_align_resource(void *data, const struct resource *res,
779 resource_size_t size, resource_size_t align) 771 resource_size_t size, resource_size_t align)
780{ 772{