From patchwork Tue Jun 26 03:32:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [16/16] cris/PCI: Factor 'pcibios_setup()' out of cris Date: Mon, 25 Jun 2012 17:32:46 -0000 From: Myron Stowe X-Patchwork-Id: 167300 Message-Id: <20120626033246.16434.46899.stgit@amt.stowe> To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, linux@arm.linux.org.uk, starvik@axis.com, jesper.nilsson@axis.com, tony.luck@intel.com, fenghua.yu@intel.com, monstr@monstr.eu, ralf@linux-mips.org, yasutake.koichi@jp.panasonic.com, jejb@parisc-linux.org, deller@gmx.de, benh@kernel.crashing.org, paulus@samba.org, lethal@linux-sh.org, davem@davemloft.net, cmetcalf@tilera.com, gxt@mprc.pku.edu.cn, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, chris@zankel.net, linux-kernel@vger.kernel.org This patch fixes what looks like a bug in cris, which implements pcibios_setup() such that pci_setup() doesn't look for any generic options. The PCI core provides a generic (__weak) 'pcibios_setup()' routine that can be used by all architectures as a default. Drop cris's architecture specific version in favor of that as it does not need to be over-ridden. Signed-off-by: Myron Stowe --- arch/cris/arch-v32/drivers/pci/bios.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 diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index bc0cfda..5b1ee82 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c @@ -6,11 +6,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) { } -char * __devinit pcibios_setup(char *str) -{ - return NULL; -} - void pcibios_set_master(struct pci_dev *dev) { u8 lat;