aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2008-10-20 19:41:07 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-22 19:42:40 -0400
commit0ad772ec464d3fcf9d210836b97e654f393606c4 (patch)
treeb2eb3d995eacec2e49dec4441fbc5349c8d1fc81 /include/linux
parent30ac7acd05d1449ac784de144c4b5237be25b0b4 (diff)
PCI, PCI Hotplug: introduce slot_name helpers
In preparation for cleaning up the various hotplug drivers such that they don't have to manage their own 'name' parameters anymore, we provide the following convenience functions: pci_slot_name() hotplug_slot_name() These helpers will be used by individual hotplug drivers. 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 'include/linux')
-rw-r--r--include/linux/pci.h5
-rw-r--r--include/linux/pci_hotplug.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9a8cee623301..955ab705c05e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -65,6 +65,11 @@ struct pci_slot {
65 struct kobject kobj; 65 struct kobject kobj;
66}; 66};
67 67
68static inline const char *pci_slot_name(const struct pci_slot *slot)
69{
70 return kobject_name(&slot->kobj);
71}
72
68/* File state for mmap()s on /proc/bus/pci/X/Y */ 73/* File state for mmap()s on /proc/bus/pci/X/Y */
69enum pci_mmap_state { 74enum pci_mmap_state {
70 pci_mmap_io, 75 pci_mmap_io,
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 5efba6671865..a3a3245943b1 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -165,6 +165,11 @@ struct hotplug_slot {
165}; 165};
166#define to_hotplug_slot(n) container_of(n, struct hotplug_slot, kobj) 166#define to_hotplug_slot(n) container_of(n, struct hotplug_slot, kobj)
167 167
168static inline const char *hotplug_slot_name(const struct hotplug_slot *slot)
169{
170 return pci_slot_name(slot->pci_slot);
171}
172
168extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr, 173extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr,
169 const char *name); 174 const char *name);
170extern int pci_hp_deregister(struct hotplug_slot *slot); 175extern int pci_hp_deregister(struct hotplug_slot *slot);