[patch 032/104] PCI, PCI Hotplug: introduce slot_name helpers

Greg KH
2008-12-03T20:03:08Z

[-- Attachment #1: pci-pci-hotplug-introduce-slot_name-helpers.patch --]
[-- Type: text/plain, Size: 2012 bytes --]

2.6.27-stable review patch. If anyone has any objections, please let us know.

------------------
From: Alex Chiang <achiang@hp.com>

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>

---
drivers/pci/slot.c | 2 +-
include/linux/pci.h | 5 +++++
include/linux/pci_hotplug.h | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)

--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -116,7 +116,7 @@ static int rename_slot(struct pci_slot *
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);
--- 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,
--- 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);