diff options
author | Alex Chiang <achiang@hp.com> | 2008-10-20 19:40:52 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-22 19:42:38 -0400 |
commit | 828f37683e6d3ab5912989df0d04201db7ad798e (patch) | |
tree | 5761f28363b8fd4b23eaf88305b3f29cfc6b92ba /drivers/pci/slot.c | |
parent | d25b7c8d6ba2735602003d75a28894772fe8ad6a (diff) |
PCI: update pci_create_slot() to take a 'hotplug' param
Slot detection drivers can co-exist with hotplug drivers. The names
of the detected/claimed slots may be different depending on module
load order.
For legacy reasons, we need to allow hotplug drivers to override
the slot name if a detection driver is loaded first (and they find
the same slots).
Creating and overriding slot names should be an atomic operation,
otherwise you get a locking nightmare as various drivers race to
call pci_create_slot().
pci_create_slot() is already serialized by grabbing the pci_bus_sem.
We update the API and add a 'hotplug' param, which is:
set if the caller is a hotplug driver
NULL if the caller is a detection driver
pci_create_slot() does not actually use the 'hotplug' parameter in this
patch. A later patch will add the logic that uses it.
Cc: kristen.c.accardi@intel.com
Cc: matthew@wil.cx
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/slot.c')
-rw-r--r-- | drivers/pci/slot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index b9b90ab6b86..0e009c3ba5f 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
@@ -83,6 +83,7 @@ static struct kobj_type pci_slot_ktype = { | |||
83 | * @parent: struct pci_bus of parent bridge | 83 | * @parent: struct pci_bus of parent bridge |
84 | * @slot_nr: PCI_SLOT(pci_dev->devfn) or -1 for placeholder | 84 | * @slot_nr: PCI_SLOT(pci_dev->devfn) or -1 for placeholder |
85 | * @name: user visible string presented in /sys/bus/pci/slots/<name> | 85 | * @name: user visible string presented in /sys/bus/pci/slots/<name> |
86 | * @hotplug: set if caller is hotplug driver, NULL otherwise | ||
86 | * | 87 | * |
87 | * PCI slots have first class attributes such as address, speed, width, | 88 | * PCI slots have first class attributes such as address, speed, width, |
88 | * and a &struct pci_slot is used to manage them. This interface will | 89 | * and a &struct pci_slot is used to manage them. This interface will |
@@ -111,7 +112,8 @@ static struct kobj_type pci_slot_ktype = { | |||
111 | */ | 112 | */ |
112 | 113 | ||
113 | struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, | 114 | struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, |
114 | const char *name) | 115 | const char *name, |
116 | struct hotplug_slot *hotplug) | ||
115 | { | 117 | { |
116 | struct pci_dev *dev; | 118 | struct pci_dev *dev; |
117 | struct pci_slot *slot; | 119 | struct pci_slot *slot; |