aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpci_hotplug_pci.c
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2008-10-20 17:41:17 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-22 16:42:39 -0700
commitd6c479e0b777afcd7a26ca62e122e3f878ccc830 (patch)
tree326fa6cb470f4d819582dfaffa33f55e42b7c78f /drivers/pci/hotplug/cpci_hotplug_pci.c
parentPCI: acpiphp: remove 'name' parameter (diff)
downloadlinux-dev-d6c479e0b777afcd7a26ca62e122e3f878ccc830.tar.xz
linux-dev-d6c479e0b777afcd7a26ca62e122e3f878ccc830.zip
PCI: cpci_hotplug: stop managing hotplug_slot->name
We no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf. Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest. Cc: kristen.c.accardi@intel.com Cc: scottm@somanetworks.com 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 '')
-rw-r--r--drivers/pci/hotplug/cpci_hotplug_pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index df82b95e2874..829c327cfb5e 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -209,7 +209,7 @@ int cpci_led_on(struct slot* slot)
hs_cap + 2,
hs_csr)) {
err("Could not set LOO for slot %s",
- slot->hotplug_slot->name);
+ hotplug_slot_name(slot->hotplug_slot));
return -ENODEV;
}
}
@@ -238,7 +238,7 @@ int cpci_led_off(struct slot* slot)
hs_cap + 2,
hs_csr)) {
err("Could not clear LOO for slot %s",
- slot->hotplug_slot->name);
+ hotplug_slot_name(slot->hotplug_slot));
return -ENODEV;
}
}