Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ad772ec authored by Alex Chiang's avatar Alex Chiang Committed by Jesse Barnes
Browse files

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: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 30ac7acd

drivers/pci/slot.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -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,

include/linux/pci_hotplug.h

+5 −0
Original line number Diff line number Diff line
@@ -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);