1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
index 3194d51c6ec9..0a46f549676a 100644
--- a/drivers/pci/hotplug/pcihp_skeleton.c
+++ b/drivers/pci/hotplug/pcihp_skeleton.c
@@ -37,10 +37,12 @@
 #include <linux/init.h>
 #include "pci_hotplug.h"
 
+#define SLOT_NAME_SIZE  10
 struct slot {
         u8 number;
         struct hotplug_slot *hotplug_slot;
         struct list_head slot_list;
+        char name[SLOT_NAME_SIZE];
 };
 
 static LIST_HEAD(slot_list);
@@ -233,12 +235,10 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
         kfree(slot->hotplug_slot->info);
-        kfree(slot->hotplug_slot->name);
         kfree(slot->hotplug_slot);
         kfree(slot);
 }
 
-#define SLOT_NAME_SIZE  10
 static void make_slot_name(struct slot *slot)
 {
         /*
@@ -257,7 +257,6 @@ static int __init init_slots(void)
         struct slot *slot;
         struct hotplug_slot *hotplug_slot;
         struct hotplug_slot_info *info;
-        char *name;
         int retval = -ENOMEM;
         int i;
 
@@ -266,31 +265,23 @@ static int __init init_slots(void)
          * with the pci_hotplug subsystem.
          */
         for (i = 0; i < num_slots; ++i) {
-                slot = kmalloc(sizeof(struct slot), GFP_KERNEL);
+                slot = kzalloc(sizeof(*slot), GFP_KERNEL);
                 if (!slot)
                         goto error;
-                memset(slot, 0, sizeof(struct slot));
 
-                hotplug_slot = kmalloc(sizeof(struct hotplug_slot),
-                                        GFP_KERNEL);
+                hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);
                 if (!hotplug_slot)
                         goto error_slot;
-                memset(hotplug_slot, 0, sizeof (struct hotplug_slot));
                 slot->hotplug_slot = hotplug_slot;
 
-                info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
+                info = kzalloc(sizeof(*info), GFP_KERNEL);
                 if (!info)
                         goto error_hpslot;
-                memset(info, 0, sizeof (struct hotplug_slot_info));
                 hotplug_slot->info = info;
 
-                name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
-                if (!name)
-                        goto error_info;
-                hotplug_slot->name = name;
-
                 slot->number = i;
 
+                hotplug_slot->name = slot->name;
                 hotplug_slot->private = slot;
                 hotplug_slot->release = &release_slot;
                 make_slot_name(slot);
@@ -300,16 +291,16 @@ static int __init init_slots(void)
                  * Initialize the slot info structure with some known
                  * good values.
                  */
-                info->power_status = get_power_status(slot);
-                info->attention_status = get_attention_status(slot);
-                info->latch_status = get_latch_status(slot);
-                info->adapter_status = get_adapter_status(slot);
+                get_power_status(hotplug_slot, &info->power_status);
+                get_attention_status(hotplug_slot, &info->attention_status);
+                get_latch_status(hotplug_slot, &info->latch_status);
+                get_adapter_status(hotplug_slot, &info->adapter_status);
                 
                 dbg("registering slot %d\n", i);
                 retval = pci_hp_register(slot->hotplug_slot);
                 if (retval) {
                         err("pci_hp_register failed with error %d\n", retval);
-                        goto error_name;
+                        goto error_info;
                 }
 
                 /* add slot to our internal list */
@@ -317,8 +308,6 @@ static int __init init_slots(void)
         }
 
         return 0;
-error_name:
-        kfree(name);
 error_info:
         kfree(info);
 error_hpslot: