diff options
author | linas@austin.ibm.com <linas@austin.ibm.com> | 2006-01-12 19:28:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 21:00:13 -0500 |
commit | e06b80b78db96ca272db4ec0b26ce1092a1a9704 (patch) | |
tree | 77f8605f27e02c46b1513837e4fc1f02b6d2b66c /drivers/pci/hotplug/rpaphp_pci.c | |
parent | 8fe64399cccf8dddcc4e5eaff270a12064f6fe9f (diff) |
[PATCH] powerpc/PCI hotplug: merge rpaphp_enable_pci_slot()
Remove general baroqueness. The function rpaphp_enable_pci_slot()
has a fairly simple logic structure, once all of the debug printk's
are removed. Its called from only one place, and that place also
has a very simple structure once he printk's are removed. Merge
the two together.
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_pci.c')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_pci.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index ce7ebec05933..d1297d070a75 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "../pci.h" /* for pci_add_new_bus */ | 32 | #include "../pci.h" /* for pci_add_new_bus */ |
33 | #include "rpaphp.h" | 33 | #include "rpaphp.h" |
34 | 34 | ||
35 | static int rpaphp_get_sensor_state(struct slot *slot, int *state) | 35 | int rpaphp_get_sensor_state(struct slot *slot, int *state) |
36 | { | 36 | { |
37 | int rc; | 37 | int rc; |
38 | int setlevel; | 38 | int setlevel; |
@@ -212,31 +212,3 @@ exit_rc: | |||
212 | return rc; | 212 | return rc; |
213 | } | 213 | } |
214 | 214 | ||
215 | int rpaphp_enable_pci_slot(struct slot *slot) | ||
216 | { | ||
217 | int retval = 0, state; | ||
218 | |||
219 | retval = rpaphp_get_sensor_state(slot, &state); | ||
220 | if (retval) | ||
221 | goto exit; | ||
222 | dbg("%s: sensor state[%d]\n", __FUNCTION__, state); | ||
223 | /* if slot is not empty, enable the adapter */ | ||
224 | if (state == PRESENT) { | ||
225 | dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name); | ||
226 | pcibios_add_pci_devices(slot->bus); | ||
227 | slot->state = CONFIGURED; | ||
228 | info("%s: devices in slot[%s] configured\n", | ||
229 | __FUNCTION__, slot->name); | ||
230 | } else if (state == EMPTY) { | ||
231 | dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name); | ||
232 | slot->state = EMPTY; | ||
233 | } else { | ||
234 | err("%s: slot[%s] is in invalid state\n", __FUNCTION__, | ||
235 | slot->name); | ||
236 | slot->state = NOT_VALID; | ||
237 | retval = -EINVAL; | ||
238 | } | ||
239 | exit: | ||
240 | dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); | ||
241 | return retval; | ||
242 | } | ||