[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>

1 files changed, 28 insertions, 10 deletions

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index acf17645fd8a..341fdd59090b 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -393,22 +393,40 @@ static void __exit rpaphp_exit(void)
         cleanup_slots();
 }
 
-static int enable_slot(struct hotplug_slot *hotplug_slot)
+static int __enable_slot(struct slot *slot)
 {
-        int retval = 0;
-        struct slot *slot = (struct slot *)hotplug_slot->private;
+        int state;
+        int retval;
 
-        if (slot->state == CONFIGURED) {
-                dbg("%s: %s is already enabled\n", __FUNCTION__, slot->name);
-                goto exit;
+        if (slot->state == CONFIGURED)
+                return 0;
+
+        retval = rpaphp_get_sensor_state(slot, &state);
+        if (retval)
+                return retval;
+
+        if (state == PRESENT) {
+                pcibios_add_pci_devices(slot->bus);
+                slot->state = CONFIGURED;
+        } else if (state == EMPTY) {
+                slot->state = EMPTY;
+        } else {
+                err("%s: slot[%s] is in invalid state\n", __FUNCTION__, slot->name);
+                slot->state = NOT_VALID;
+                return -EINVAL;
         }
+        return 0;
+}
+
+static int enable_slot(struct hotplug_slot *hotplug_slot)
+{
+        int retval;
+        struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        dbg("ENABLING SLOT %s\n", slot->name);
         down(&rpaphp_sem);
-        retval = rpaphp_enable_pci_slot(slot);
+        retval = __enable_slot(slot);
         up(&rpaphp_sem);
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
         return retval;
 }