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

[deliverable/linux.git] / drivers / cpuidle / cpuidle-kirkwood.c

diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 670aa1e55cd644b962cda1c0e6aa438bc71aae5d..53290e1f86c78f0c4e414a5477ce8db5cf498dda 100644 (file)
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -41,7 +41,6 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver kirkwood_idle_driver = {
        .name                   = "kirkwood_idle",
        .owner                  = THIS_MODULE,
-       .en_core_tk_irqen       = 1,
        .states[0]              = ARM_CPUIDLE_WFI_STATE,
        .states[1]              = {
                .enter                  = kirkwood_enter_idle,
@@ -53,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)
@@ -66,26 +62,16 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)
        if (res == NULL)
                return -EINVAL;
 
-       ddr_operation_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!ddr_operation_base)
-               return -EADDRNOTAVAIL;
-
-       device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
-       device->state_count = KIRKWOOD_MAX_STATES;
+       ddr_operation_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(ddr_operation_base))
+               return PTR_ERR(ddr_operation_base);
 
-       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;
 }