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

[karo-tx-linux.git] / drivers / cpuidle / cpuidle-kirkwood.c

diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 6f31524369830bd4b9fef783d1261877caf05b3b..53290e1f86c78f0c4e414a5477ce8db5cf498dda 100644 (file)
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -52,9 +52,6 @@ static struct cpuidle_driver kirkwood_idle_driver = {
        },
        .state_count = KIRKWOOD_MAX_STATES,
 };
-static struct cpuidle_device *device;
-
-static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
 
 /* Initialize CPU idle by registering the idle states */
 static int kirkwood_cpuidle_probe(struct platform_device *pdev)
@@ -69,22 +66,12 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)
        if (IS_ERR(ddr_operation_base))
                return PTR_ERR(ddr_operation_base);
 
-       device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
-       device->state_count = KIRKWOOD_MAX_STATES;
-
-       cpuidle_register_driver(&kirkwood_idle_driver);
-       if (cpuidle_register_device(device)) {
-               pr_err("kirkwood_init_cpuidle: Failed registering\n");
-               return -EIO;
-       }
-       return 0;
+       return cpuidle_register(&kirkwood_idle_driver, NULL);
 }
 
 int kirkwood_cpuidle_remove(struct platform_device *pdev)
 {
-       cpuidle_unregister_device(device);
-       cpuidle_unregister_driver(&kirkwood_idle_driver);
-
+       cpuidle_unregister(&kirkwood_idle_driver);
        return 0;
 }