ARM: at91: cpuidle: use init/exit common routine

Remove the duplicated code and use the cpuidle common code for initialization.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index 0130df7f0524a2369bd79f88f6be986fee7aa0ca..48f1228c611cc13712aa4c5b5b8d8fd419c6930f 100644 (file)
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -27,8 +27,6 @@
 
 #define AT91_MAX_STATES        2
 
-static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);
-
 /* Actual code that puts the SoC in different idle states */
 static int at91_enter_idle(struct cpuidle_device *dev,
                        struct cpuidle_driver *drv,
@@ -60,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int at91_init_cpuidle(void)
+static int __init at91_init_cpuidle(void)
 {
-       struct cpuidle_device *device;
-
-       device = &per_cpu(at91_cpuidle_device, smp_processor_id());
-       device->state_count = AT91_MAX_STATES;
-
-       cpuidle_register_driver(&at91_idle_driver);
-
-       if (cpuidle_register_device(device)) {
-               printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");
-               return -EIO;
-       }
-       return 0;
+       return cpuidle_register(&at91_idle_driver, NULL);
 }
 
 device_initcall(at91_init_cpuidle);