summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-06-25 21:30:57 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-06-26 06:22:31 -0600
commit2b6f2c3520124e8bad4bffa71f5b98e602b9cf03 (patch)
treef99110de830ffaa0e592d9d66294293ca0c3dd3e /drivers/pci
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff)
PCI: pull pcibios_setup() up into core
Currently, all of the architectures implement their own pcibios_setup() routine. Most of the implementations do nothing so this patch introduces a generic (__weak) routine in the core that can be used by all architectures as a default. If necessary, it can be overridden by architecture-specific code. Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 447e83472c01..c87d518acace 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2666,6 +2666,18 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)
}
/**
+ * pcibios_setup - process "pci=" kernel boot arguments
+ * @str: string used to pass in "pci=" kernel boot arguments
+ *
+ * Process kernel boot arguments. This is the default implementation.
+ * Architecture specific implementations can override this as necessary.
+ */
+char * __weak __init pcibios_setup(char *str)
+{
+ return str;
+}
+
+/**
* pcibios_set_master - enable PCI bus-mastering for device dev
* @dev: the PCI device to enable
*