leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Hotplug core: remove 'name'

Browse Source 
Now that the PCI core manages the 'name' for each individual
hotplug driver, and all drivers (except rpaphp) have been converted
to use hotplug_slot_name(), there is no need for the PCI hotplug
core to drag around its own copy of name either.

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>
This commit is contained in:
Alex Chiang 2008-10-20 17:41:58 -06:00 committed by Jesse Barnes
parent 66f1705580
commit 58319b802a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/hotplug/pci_hotplug_core.c
View File

@ -533,7 +533,7 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
list_for_each (tmp, &pci_hotplug_slot_list) { list_for_each (tmp, &pci_hotplug_slot_list) {
slot = list_entry (tmp, struct hotplug_slot, slot_list); slot = list_entry (tmp, struct hotplug_slot, slot_list);
if (strcmp(slot->name, name) == 0) if (strcmp(hotplug_slot_name(slot), name) == 0)
return slot; return slot;
} }
return NULL; return NULL;
@ -611,7 +611,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
return -ENODEV; return -ENODEV;
mutex_lock(&pci_hp_mutex); mutex_lock(&pci_hp_mutex);
temp = get_slot_from_name(hotplug->name); temp = get_slot_from_name(hotplug_slot_name(hotplug));
if (temp != hotplug) { if (temp != hotplug) {
mutex_unlock(&pci_hp_mutex); mutex_unlock(&pci_hp_mutex);
return -ENODEV; return -ENODEV;
@ -621,7 +621,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
slot = hotplug->pci_slot; slot = hotplug->pci_slot;
fs_remove_slot(slot); fs_remove_slot(slot);
dbg("Removed slot %s from the list\n", hotplug->name); dbg("Removed slot %s from the list\n", hotplug_slot_name(hotplug));
hotplug->release(hotplug); hotplug->release(hotplug);
slot->hotplug = NULL; slot->hotplug = NULL;

3
include/linux/pci_hotplug.h
View File

@ -142,8 +142,6 @@ struct hotplug_slot_info {
/** /**
* struct hotplug_slot - used to register a physical slot with the hotplug pci core * struct hotplug_slot - used to register a physical slot with the hotplug pci core
* @name: the name of the slot being registered. This string must
* be unique amoung slots registered on this system.
* @ops: pointer to the &struct hotplug_slot_ops to be used for this slot * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot
* @info: pointer to the &struct hotplug_slot_info for the initial values for * @info: pointer to the &struct hotplug_slot_info for the initial values for
* this slot. * this slot.
@ -153,7 +151,6 @@ struct hotplug_slot_info {
* needs. * needs.
*/ */
struct hotplug_slot { struct hotplug_slot {
char *name;
struct hotplug_slot_ops *ops; struct hotplug_slot_ops *ops;
struct hotplug_slot_info *info; struct hotplug_slot_info *info;
void (*release) (struct hotplug_slot *slot); void (*release) (struct hotplug_slot *slot);