intel_idle: use the common cpuidle_[un]register() routines

It is now possible to use the common cpuidle_[un]register() routines
(instead of open-coding them) so do it.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Len Brown <lenb@kernel.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 4a07cc7f1bf032f3f453c03557f1108900f0a756..623da270c2cf752c357a457482ff96d8737642bf 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -93,10 +93,8 @@ struct idle_cpu {
 };
 
 static const struct idle_cpu *icpu;
-static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
 static int intel_idle(struct cpuidle_device *dev,
                        struct cpuidle_driver *drv, int index);
-static int intel_idle_cpu_init(int cpu);
 
 static struct cpuidle_state *cpuidle_state_table;
 
@@ -403,11 +401,27 @@ static void __setup_broadcast_timer(void *arg)
        clockevents_notify(reason, &cpu);
 }
 
+static void auto_demotion_disable(void *dummy)
+{
+       unsigned long long msr_bits;
+
+       rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
+       msr_bits &= ~(icpu->auto_demotion_disable_flags);
+       wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
+}
+static void c1e_promotion_disable(void *dummy)
+{
+       unsigned long long msr_bits;
+
+       rdmsrl(MSR_IA32_POWER_CTL, msr_bits);
+       msr_bits &= ~0x2;
+       wrmsrl(MSR_IA32_POWER_CTL, msr_bits);
+}
+
 static int cpu_hotplug_notify(struct notifier_block *n,
                              unsigned long action, void *hcpu)
 {
        int hotcpu = (unsigned long)hcpu;
-       struct cpuidle_device *dev;
 
        switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_ONLINE:
@@ -419,11 +433,15 @@ static int cpu_hotplug_notify(struct notifier_block *n,
                /*
                 * Some systems can hotplug a cpu at runtime after
                 * the kernel has booted, we have to initialize the
-                * driver in this case
+                * hardware in this case.
                 */
-               dev = per_cpu_ptr(intel_idle_cpuidle_devices, hotcpu);
-               if (!dev->registered)
-                       intel_idle_cpu_init(hotcpu);
+               if (icpu->auto_demotion_disable_flags)
+                       smp_call_function_single(hotcpu, auto_demotion_disable,
+                                               NULL, 1);
+
+               if (icpu->disable_promotion_to_c1e)
+                       smp_call_function_single(hotcpu, c1e_promotion_disable,
+                                               NULL, 1);
 
                break;
        }
@@ -434,23 +452,6 @@ static struct notifier_block cpu_hotplug_notifier = {
        .notifier_call = cpu_hotplug_notify,
 };
 
-static void auto_demotion_disable(void *dummy)
-{
-       unsigned long long msr_bits;
-
-       rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
-       msr_bits &= ~(icpu->auto_demotion_disable_flags);
-       wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
-}
-static void c1e_promotion_disable(void *dummy)
-{
-       unsigned long long msr_bits;
-
-       rdmsrl(MSR_IA32_POWER_CTL, msr_bits);
-       msr_bits &= ~0x2;
-       wrmsrl(MSR_IA32_POWER_CTL, msr_bits);
-}
-
 static const struct idle_cpu idle_cpu_nehalem = {
        .state_table = nehalem_cstates,
        .auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE,
@@ -562,23 +563,6 @@ static int __init intel_idle_probe(void)
        return 0;
 }
 
-/*
- * intel_idle_cpuidle_devices_uninit()
- * unregister, free cpuidle_devices
- */
-static void intel_idle_cpuidle_devices_uninit(void)
-{
-       int i;
-       struct cpuidle_device *dev;
-
-       for_each_online_cpu(i) {
-               dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
-               cpuidle_unregister_device(dev);
-       }
-
-       free_percpu(intel_idle_cpuidle_devices);
-       return;
-}
 /*
  * intel_idle_cpuidle_driver_init()
  * allocate, initialize cpuidle_states
@@ -635,37 +619,9 @@ static int __init intel_idle_cpuidle_driver_init(void)
 }
 
 
-/*
- * intel_idle_cpu_init()
- * allocate, initialize, register cpuidle_devices
- * @cpu: cpu/core to initialize
- */
-static int intel_idle_cpu_init(int cpu)
-{
-       struct cpuidle_device *dev;
-
-       dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);
-
-       dev->cpu = cpu;
-
-       if (cpuidle_register_device(dev)) {
-               pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
-               intel_idle_cpuidle_devices_uninit();
-               return -EIO;
-       }
-
-       if (icpu->auto_demotion_disable_flags)
-               smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);
-
-       if (icpu->disable_promotion_to_c1e)
-               smp_call_function_single(cpu, c1e_promotion_disable, NULL, 1);
-
-       return 0;
-}
-
 static int __init intel_idle_init(void)
 {
-       int retval, i;
+       int retval;
 
        /* Do not load intel_idle at all for now if idle= is passed */
        if (boot_option_idle_override != IDLE_NO_OVERRIDE)
@@ -676,7 +632,8 @@ static int __init intel_idle_init(void)
                return retval;
 
        intel_idle_cpuidle_driver_init();
-       retval = cpuidle_register_driver(&intel_idle_driver);
+
+       retval = cpuidle_register(&intel_idle_driver, NULL);
        if (retval) {
                struct cpuidle_driver *drv = cpuidle_get_driver();
                printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
@@ -684,17 +641,6 @@ static int __init intel_idle_init(void)
                return retval;
        }
 
-       intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-       if (intel_idle_cpuidle_devices == NULL)
-               return -ENOMEM;
-
-       for_each_online_cpu(i) {
-               retval = intel_idle_cpu_init(i);
-               if (retval) {
-                       cpuidle_unregister_driver(&intel_idle_driver);
-                       return retval;
-               }
-       }
        register_cpu_notifier(&cpu_hotplug_notifier);
 
        return 0;
@@ -702,9 +648,7 @@ static int __init intel_idle_init(void)
 
 static void __exit intel_idle_exit(void)
 {
-       intel_idle_cpuidle_devices_uninit();
-       cpuidle_unregister_driver(&intel_idle_driver);
-
+       cpuidle_unregister(&intel_idle_driver);
 
        if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE)
                on_each_cpu(__setup_broadcast_timer, (void *)false, 1);