aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2008-10-20 19:41:58 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-22 19:42:43 -0400
commit58319b802a614f10f1b5238fbde7a4b2e9a60069 (patch)
tree2f1d284bf836bf06f8469b9cf77836fd34543a3f /drivers/pci/hotplug
parent66f1705580f796a3f52c092e9dc92cbe5df41dd6 (diff)
PCI: Hotplug core: remove 'name'
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>
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/pci_hotplug_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index a6f1f282b683..535fce0f07f9 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -533,7 +533,7 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
533 533
534 list_for_each (tmp, &pci_hotplug_slot_list) { 534 list_for_each (tmp, &pci_hotplug_slot_list) {
535 slot = list_entry (tmp, struct hotplug_slot, slot_list); 535 slot = list_entry (tmp, struct hotplug_slot, slot_list);
536 if (strcmp(slot->name, name) == 0) 536 if (strcmp(hotplug_slot_name(slot), name) == 0)
537 return slot; 537 return slot;
538 } 538 }
539 return NULL; 539 return NULL;
@@ -611,7 +611,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
611 return -ENODEV; 611 return -ENODEV;
612 612
613 mutex_lock(&pci_hp_mutex); 613 mutex_lock(&pci_hp_mutex);
614 temp = get_slot_from_name(hotplug->name); 614 temp = get_slot_from_name(hotplug_slot_name(hotplug));
615 if (temp != hotplug) { 615 if (temp != hotplug) {
616 mutex_unlock(&pci_hp_mutex); 616 mutex_unlock(&pci_hp_mutex);
617 return -ENODEV; 617 return -ENODEV;
@@ -621,7 +621,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
621 621
622 slot = hotplug->pci_slot; 622 slot = hotplug->pci_slot;
623 fs_remove_slot(slot); 623 fs_remove_slot(slot);
624 dbg("Removed slot %s from the list\n", hotplug->name); 624 dbg("Removed slot %s from the list\n", hotplug_slot_name(hotplug));
625 625
626 hotplug->release(hotplug); 626 hotplug->release(hotplug);
627 slot->hotplug = NULL; 627 slot->hotplug = NULL;