PCI, PCI Hotplug: introduce slot_name helpers

commit 0ad772ec464d3fcf9d210836b97e654f393606c4 upstream

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index de7994a8b32a4a0bded6c4de4e87c93f0b67bf36..b703b097ce106e6926bbec57cc673c03761eac73 100644 (file)
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -116,7 +116,7 @@ static int rename_slot(struct pci_slot *slot, const char *name)
        int result = 0;
        char *slot_name;
 
-       if (strcmp(kobject_name(&slot->kobj), name) == 0)
+       if (strcmp(pci_slot_name(slot), name) == 0)
                return result;
 
        slot_name = make_slot_name(name);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 86ed5f9600933f30998ce604878a3cd48523b84c..426e029dbe7253ece5efbf0207f6e85d2c1945c8 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -64,6 +64,11 @@ struct pci_slot {
        struct kobject kobj;
 };
 
+static inline const char *pci_slot_name(const struct pci_slot *slot)
+{
+       return kobject_name(&slot->kobj);
+}
+
 /* File state for mmap()s on /proc/bus/pci/X/Y */
 enum pci_mmap_state {
        pci_mmap_io,

diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 5efba6671865e8047732ece8662680293d8d17bd..a3a3245943b1aaf2ccc9c30267bd5bd5a97144d3 100644 (file)
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -165,6 +165,11 @@ struct hotplug_slot {
 };
 #define to_hotplug_slot(n) container_of(n, struct hotplug_slot, kobj)
 
+static inline const char *hotplug_slot_name(const struct hotplug_slot *slot)
+{
+       return pci_slot_name(slot->pci_slot);
+}
+
 extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr,
                           const char *name);
 extern int pci_hp_deregister(struct hotplug_slot *slot);