Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-2.6-block.git] / arch / powerpc / platforms / pseries / processor_idle.c

diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index 09e4f564aabd852c8d6fba60ee0eae5e3c83da33..002d5b4112f25b4ac352ad7bab3ab7abfde8b1bf 100644 (file)
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -27,7 +27,6 @@ struct cpuidle_driver pseries_idle_driver = {
 #define MAX_IDLE_STATE_COUNT   2
 
 static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
-static struct cpuidle_device __percpu *pseries_cpuidle_devices;
 static struct cpuidle_state *cpuidle_state_table;
 
 static inline void idle_loop_prolog(unsigned long *in_purr)
@@ -188,7 +187,7 @@ static int pseries_cpuidle_add_cpu_notifier(struct notifier_block *n,
 {
        int hotcpu = (unsigned long)hcpu;
        struct cpuidle_device *dev =
-                       per_cpu_ptr(pseries_cpuidle_devices, hotcpu);
+                       per_cpu_ptr(cpuidle_devices, hotcpu);
 
        if (dev && cpuidle_get_driver()) {
                switch (action) {
@@ -245,50 +244,6 @@ static int pseries_cpuidle_driver_init(void)
        return 0;
 }
 
-/* pseries_idle_devices_uninit(void)
- * unregister cpuidle devices and de-allocate memory
- */
-static void pseries_idle_devices_uninit(void)
-{
-       int i;
-       struct cpuidle_device *dev;
-
-       for_each_possible_cpu(i) {
-               dev = per_cpu_ptr(pseries_cpuidle_devices, i);
-               cpuidle_unregister_device(dev);
-       }
-
-       free_percpu(pseries_cpuidle_devices);
-       return;
-}
-
-/* pseries_idle_devices_init()
- * allocate, initialize and register cpuidle device
- */
-static int pseries_idle_devices_init(void)
-{
-       int i;
-       struct cpuidle_driver *drv = &pseries_idle_driver;
-       struct cpuidle_device *dev;
-
-       pseries_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-       if (pseries_cpuidle_devices == NULL)
-               return -ENOMEM;
-
-       for_each_possible_cpu(i) {
-               dev = per_cpu_ptr(pseries_cpuidle_devices, i);
-               dev->state_count = drv->state_count;
-               dev->cpu = i;
-               if (cpuidle_register_device(dev)) {
-                       printk(KERN_DEBUG \
-                               "cpuidle_register_device %d failed!\n", i);
-                       return -EIO;
-               }
-       }
-
-       return 0;
-}
-
 /*
  * pseries_idle_probe()
  * Choose state table for shared versus dedicated partition
@@ -324,19 +279,12 @@ static int __init pseries_processor_idle_init(void)
                return retval;
 
        pseries_cpuidle_driver_init();
-       retval = cpuidle_register_driver(&pseries_idle_driver);
+       retval = cpuidle_register(&pseries_idle_driver, NULL);
        if (retval) {
                printk(KERN_DEBUG "Registration of pseries driver failed.\n");
                return retval;
        }
 
-       retval = pseries_idle_devices_init();
-       if (retval) {
-               pseries_idle_devices_uninit();
-               cpuidle_unregister_driver(&pseries_idle_driver);
-               return retval;
-       }
-
        register_cpu_notifier(&setup_hotplug_notifier);
        printk(KERN_DEBUG "pseries_idle_driver registered\n");
 
@@ -347,8 +295,7 @@ static void __exit pseries_processor_idle_exit(void)
 {
 
        unregister_cpu_notifier(&setup_hotplug_notifier);
-       pseries_idle_devices_uninit();
-       cpuidle_unregister_driver(&pseries_idle_driver);
+       cpuidle_unregister(&pseries_idle_driver);
 
        return;
 }