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>

diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index b6ee352ae459939c3c7063f83d5fb87dff8ca52f..4dd1c3e157aec6d6c136c02255faed19d46c3dc1 100644 (file)
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -121,7 +121,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 9a8cee62330138e203347545ed48061f2c80aa73..955ab705c05e7b12301c1e7f76bc279c26a49101 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -65,6 +65,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);