diff options
| author | Alex Chiang <achiang@hp.com> | 2008-10-20 17:41:17 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-22 16:42:39 -0700 |
| commit | d6c479e0b777afcd7a26ca62e122e3f878ccc830 (patch) | |
| tree | 326fa6cb470f4d819582dfaffa33f55e42b7c78f /drivers/pci/hotplug/cpci_hotplug.h | |
| parent | df77cd10078e36e1b89964e5e8c206add399a98d (diff) | |
| download | blackbird-op-linux-d6c479e0b777afcd7a26ca62e122e3f878ccc830.tar.gz blackbird-op-linux-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 'drivers/pci/hotplug/cpci_hotplug.h')
| -rw-r--r-- | drivers/pci/hotplug/cpci_hotplug.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h index d9769b30be9a..9fff878cf026 100644 --- a/drivers/pci/hotplug/cpci_hotplug.h +++ b/drivers/pci/hotplug/cpci_hotplug.h @@ -30,6 +30,7 @@ #include <linux/types.h> #include <linux/pci.h> +#include <linux/pci_hotplug.h> /* PICMG 2.1 R2.0 HS CSR bits: */ #define HS_CSR_INS 0x0080 @@ -69,6 +70,11 @@ struct cpci_hp_controller { struct cpci_hp_controller_ops *ops; }; +static inline const char *slot_name(struct slot *slot) +{ + return hotplug_slot_name(slot->hotplug_slot); +} + extern int cpci_hp_register_controller(struct cpci_hp_controller *controller); extern int cpci_hp_unregister_controller(struct cpci_hp_controller *controller); extern int cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last); |
