Skip to content

Commit

Permalink
PCI, PCI Hotplug: introduce slot_name helpers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Chiang authored and Jesse Barnes committed Oct 22, 2008
1 parent 30ac7ac commit 0ad772e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/slot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 5 additions & 0 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions include/linux/pci_hotplug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0ad772e

Please sign in to comment.