4 files changed, 21 insertions, 16 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d2fabe7863a9..2a98d99cbd46 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -12,7 +12,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>
-#include <linux/latency.h>
+#include <linux/pm_qos_params.h>
 #include <linux/cpu.h>
 #include <linux/cpuidle.h>
 
@@ -265,7 +265,10 @@ static struct notifier_block cpuidle_latency_notifier = {
         .notifier_call = cpuidle_latency_notify,
 };
 
-#define latency_notifier_init(x) do { register_latency_notifier(x); } while (0)
+static inline void latency_notifier_init(struct notifier_block *n)
+{
+        pm_qos_add_notifier(PM_QOS_CPU_DMA_LATENCY, n);
+}
 
 #else /* CONFIG_SMP */
 
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index eb666ecae7c9..ba7b9a6b17a1 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -14,7 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/cpuidle.h>
-#include <linux/latency.h>
+#include <linux/pm_qos_params.h>
 #include <linux/moduleparam.h>
 #include <linux/jiffies.h>
 
@@ -81,7 +81,8 @@ static int ladder_select_state(struct cpuidle_device *dev)
         /* consider promotion */
         if (last_idx < dev->state_count - 1 &&
             last_residency > last_state->threshold.promotion_time &&
-            dev->states[last_idx + 1].exit_latency <= system_latency_constraint()) {
+            dev->states[last_idx + 1].exit_latency <=
+                        pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
                 last_state->stats.promotion_count++;
                 last_state->stats.demotion_count = 0;
                 if (last_state->stats.promotion_count >= last_state->threshold.promotion_count) {
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 299d45c3bdd2..78d77c5dc35c 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -8,7 +8,7 @@
 
 #include <linux/kernel.h>
 #include <linux/cpuidle.h>
-#include <linux/latency.h>
+#include <linux/pm_qos_params.h>
 #include <linux/time.h>
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
@@ -48,7 +48,7 @@ static int menu_select(struct cpuidle_device *dev)
                         break;
                 if (s->target_residency > data->predicted_us)
                         break;
-                if (s->exit_latency > system_latency_constraint())
+                if (s->exit_latency > pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY))
                         break;
         }
 
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 0f3515e77d4b..088ea74edd34 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -277,7 +277,7 @@ static struct kobj_type ktype_state_cpuidle = {
 
 static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
 {
-        kobject_unregister(&device->kobjs[i]->kobj);
+        kobject_put(&device->kobjs[i]->kobj);
         wait_for_completion(&device->kobjs[i]->kobj_unregister);
         kfree(device->kobjs[i]);
         device->kobjs[i] = NULL;
@@ -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;
 }
 
 /**
@@ -357,5 +358,5 @@ void cpuidle_remove_sysfs(struct sys_device *sysdev)
         struct cpuidle_device *dev;
 
         dev = per_cpu(cpuidle_devices, cpu);
-        kobject_unregister(&dev->kobj);
+        kobject_put(&dev->kobj);
 }