diff options
| -rw-r--r-- | drivers/pci/slot.c | 2 | ||||
| -rw-r--r-- | include/linux/pci.h | 5 | ||||
| -rw-r--r-- | include/linux/pci_hotplug.h | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index b6ee352ae45..4dd1c3e157a 100644 --- 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 9a8cee62330..955ab705c05 100644 --- 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 5efba667186..a3a3245943b 100644 --- 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); |