diff options
author | linas@austin.ibm.com <linas@austin.ibm.com> | 2006-01-12 19:31:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 21:00:13 -0500 |
commit | f6afbad82c6b7bab0198442592b110341fb419ba (patch) | |
tree | 6a444ff2b09cc08e93f6f2825b6cfc5e507a029e /drivers/pci/hotplug/rpaphp_core.c | |
parent | e06b80b78db96ca272db4ec0b26ce1092a1a9704 (diff) |
[PATCH] powerpc/PCI hotplug: cleanup: add prefix
Minor cleanup. Add the prefix rpaphp_* to several generic-sounding routines.
Remove rpaphp_remove_slot(), which is a one-liner.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 341fdd59090b..c0e521c8f9ef 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
@@ -196,11 +196,6 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
196 | return 0; | 196 | return 0; |
197 | } | 197 | } |
198 | 198 | ||
199 | int rpaphp_remove_slot(struct slot *slot) | ||
200 | { | ||
201 | return deregister_slot(slot); | ||
202 | } | ||
203 | |||
204 | static int get_children_props(struct device_node *dn, int **drc_indexes, | 199 | static int get_children_props(struct device_node *dn, int **drc_indexes, |
205 | int **drc_names, int **drc_types, int **drc_power_domains) | 200 | int **drc_names, int **drc_types, int **drc_power_domains) |
206 | { | 201 | { |
@@ -307,13 +302,15 @@ static int is_php_dn(struct device_node *dn, int **indexes, int **names, | |||
307 | return 0; | 302 | return 0; |
308 | } | 303 | } |
309 | 304 | ||
310 | /**************************************************************** | 305 | /** |
306 | * rpaphp_add_slot -- add hotplug or dlpar slot | ||
307 | * | ||
311 | * rpaphp not only registers PCI hotplug slots(HOTPLUG), | 308 | * rpaphp not only registers PCI hotplug slots(HOTPLUG), |
312 | * but also logical DR slots(EMBEDDED). | 309 | * but also logical DR slots(EMBEDDED). |
313 | * HOTPLUG slot: An adapter can be physically added/removed. | 310 | * HOTPLUG slot: An adapter can be physically added/removed. |
314 | * EMBEDDED slot: An adapter can be logically removed/added | 311 | * EMBEDDED slot: An adapter can be logically removed/added |
315 | * from/to a partition with the slot. | 312 | * from/to a partition with the slot. |
316 | ***************************************************************/ | 313 | */ |
317 | int rpaphp_add_slot(struct device_node *dn) | 314 | int rpaphp_add_slot(struct device_node *dn) |
318 | { | 315 | { |
319 | struct slot *slot; | 316 | struct slot *slot; |
@@ -344,7 +341,7 @@ int rpaphp_add_slot(struct device_node *dn) | |||
344 | dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n", | 341 | dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n", |
345 | indexes[i + 1], name, type); | 342 | indexes[i + 1], name, type); |
346 | 343 | ||
347 | retval = register_pci_slot(slot); | 344 | retval = rpaphp_register_pci_slot(slot); |
348 | } | 345 | } |
349 | } | 346 | } |
350 | exit: | 347 | exit: |
@@ -462,6 +459,5 @@ module_init(rpaphp_init); | |||
462 | module_exit(rpaphp_exit); | 459 | module_exit(rpaphp_exit); |
463 | 460 | ||
464 | EXPORT_SYMBOL_GPL(rpaphp_add_slot); | 461 | EXPORT_SYMBOL_GPL(rpaphp_add_slot); |
465 | EXPORT_SYMBOL_GPL(rpaphp_remove_slot); | ||
466 | EXPORT_SYMBOL_GPL(rpaphp_slot_head); | 462 | EXPORT_SYMBOL_GPL(rpaphp_slot_head); |
467 | EXPORT_SYMBOL_GPL(rpaphp_get_drc_props); | 463 | EXPORT_SYMBOL_GPL(rpaphp_get_drc_props); |