summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-01-21 13:20:51 -0800
committerBjorn Helgaas <bhelgaas@google.com>2013-01-25 15:10:12 -0700
commit58d9a38f6facb28e935ec2747f6d9e9bf4684118 (patch)
tree252899cd333ccc3c23c2435acd3f377512092aa0 /include/linux/pci.h
parentd59f53bc9bd80ee62072dea590fc623c67cb84a8 (diff)
downloadtalos-obmc-linux-58d9a38f6facb28e935ec2747f6d9e9bf4684118.tar.gz
talos-obmc-linux-58d9a38f6facb28e935ec2747f6d9e9bf4684118.zip
PCI: Skip attaching driver in device_add()
We want to add PCI devices to the device tree as early as possible but delay attaching drivers. device_add() adds a device to the device hierarchy and (via device_attach()) attaches a matching driver and calls its .probe() method. We want to separate adding the device to the hierarchy from attaching the driver. This patch does that by adding "match_driver" in struct pci_dev. When false, we return failure from pci_bus_match(), which makes device_attach() believe there's no matching driver. Later, we set "match_driver = true" and call device_attach() again, which now attaches the driver and calls its .probe() method. [bhelgaas: changelog, explicitly init dev->match_driver, fold device_attach() call into pci_bus_add_device()] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 907b455ab603..8ee7e4e46539 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -286,6 +286,7 @@ struct pci_dev {
unsigned int irq;
struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+ bool match_driver; /* Skip attaching driver */
/* These fields are used by common fixups */
unsigned int transparent:1; /* Transparent PCI bridge */
unsigned int multifunction:1;/* Part of multi-function device */
OpenPOWER on IntegriCloud