1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 0f3515e77d4b..059db9c21474 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -300,14 +300,13 @@ int cpuidle_add_state_sysfs(struct cpuidle_device *device)
                 kobj->state = &device->states[i];
                 init_completion(&kobj->kobj_unregister);
 
-                kobj->kobj.parent = &device->kobj;
-                kobj->kobj.ktype = &ktype_state_cpuidle;
-                kobject_set_name(&kobj->kobj, "state%d", i);
-                ret = kobject_register(&kobj->kobj);
+                ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle, &device->kobj,
+                                           "state%d", i);
                 if (ret) {
                         kfree(kobj);
                         goto error_state;
                 }
+                kobject_uevent(&kobj->kobj, KOBJ_ADD);
                 device->kobjs[i] = kobj;
         }
 
@@ -339,12 +338,14 @@ int cpuidle_add_sysfs(struct sys_device *sysdev)
 {
         int cpu = sysdev->id;
         struct cpuidle_device *dev;
+        int error;
 
         dev = per_cpu(cpuidle_devices, cpu);
-        dev->kobj.parent = &sysdev->kobj;
-        dev->kobj.ktype = &ktype_cpuidle;
-        kobject_set_name(&dev->kobj, "%s", "cpuidle");
-        return kobject_register(&dev->kobj);
+        error = kobject_init_and_add(&dev->kobj, &ktype_cpuidle, &sysdev->kobj,
+                                     "cpuidle");
+        if (!error)
+                kobject_uevent(&dev->kobj, KOBJ_ADD);
+        return error;
 }
 
 /**