1 files changed, 6 insertions, 43 deletions

diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 3009193f0058..d4ee8723fcb3 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = {
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = (struct slot *) hotplug_slot->private;
-
         dealloc_slot_struct(slot);
 }
 
@@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot)
         kfree(slot->hotplug_slot->info);
         kfree(slot->hotplug_slot->name);
         kfree(slot->hotplug_slot);
+        kfree(slot->location);
         kfree(slot);
-        return;
 }
 
-struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name,
-                  int power_domain)
+struct slot *alloc_slot_struct(struct device_node *dn,
+                       int drc_index, char *drc_name, int power_domain)
 {
         struct slot *slot;
         
@@ -115,7 +114,7 @@ error_nomem:
 
 static int is_registered(struct slot *slot)
 {
-        struct slot             *tmp_slot;
+        struct slot *tmp_slot;
 
         list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) {
                 if (!strcmp(tmp_slot->name, slot->name))
@@ -140,8 +139,6 @@ int rpaphp_deregister_slot(struct slot *slot)
         retval = pci_hp_deregister(php_slot);
         if (retval)
                 err("Problem unregistering a slot %s\n", slot->name);
-        else
-                num_slots--;
 
         dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
         return retval;
@@ -160,14 +157,13 @@ int rpaphp_register_slot(struct slot *slot)
         /* should not try to register the same slot twice */
         if (is_registered(slot)) {
                 err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-                retval = -EAGAIN;
-                goto register_fail;
+                return -EAGAIN;
         }       
 
         retval = pci_hp_register(php_slot);
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
-                goto register_fail;
+                return retval;
         }
 
         /* create "phy_location" file */
@@ -181,43 +177,10 @@ int rpaphp_register_slot(struct slot *slot)
         list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
         info("Slot [%s](PCI location=%s) registered\n", slot->name,
                         slot->location);
-        num_slots++;
         return 0;
 
 sysfs_fail:
         pci_hp_deregister(php_slot);
-register_fail:
-        rpaphp_release_slot(php_slot);
         return retval;
 }
 
-int rpaphp_get_power_status(struct slot *slot, u8 * value)
-{
-        int rc = 0, level;
-        
-        rc = rtas_get_power_level(slot->power_domain, &level);
-        if (rc < 0) {
-                err("failed to get power-level for slot(%s), rc=0x%x\n",
-                        slot->location, rc);
-                return rc;
-        }
-
-        dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
-                __FUNCTION__, slot->name, slot->power_domain, level);
-        *value = level;
-
-        return rc;
-}
-
-int rpaphp_set_attention_status(struct slot *slot, u8 status)
-{
-        int rc;
-
-        /* status: LED_OFF or LED_ON */
-        rc = rtas_set_indicator(DR_INDICATOR, slot->index, status);
-        if (rc < 0)
-                err("slot(name=%s location=%s index=0x%x) set attention-status(%d) failed! rc=0x%x\n",
-                    slot->name, slot->location, slot->index, status, rc);
-
-        return rc;
-}