1 files changed, 23 insertions, 29 deletions

diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
index 2e44f11f592e..1b2334277e85 100644
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -26,65 +26,59 @@ void (*shmobile_cpuidle_modes[CPUIDLE_STATE_MAX])(void) = {
 };
 
 static int shmobile_cpuidle_enter(struct cpuidle_device *dev,
-                                  struct cpuidle_state *state)
+                                  struct cpuidle_driver *drv,
+                                  int index)
 {
         ktime_t before, after;
-        int requested_state = state - &dev->states[0];
 
-        dev->last_state = &dev->states[requested_state];
         before = ktime_get();
 
         local_irq_disable();
         local_fiq_disable();
 
-        shmobile_cpuidle_modes[requested_state]();
+        shmobile_cpuidle_modes[index]();
 
         local_irq_enable();
         local_fiq_enable();
 
         after = ktime_get();
-        return ktime_to_ns(ktime_sub(after, before)) >> 10;
+        dev->last_residency = ktime_to_ns(ktime_sub(after, before)) >> 10;
+
+        return index;
 }
 
 static struct cpuidle_device shmobile_cpuidle_dev;
 static struct cpuidle_driver shmobile_cpuidle_driver = {
         .name =         "shmobile_cpuidle",
         .owner =        THIS_MODULE,
+        .states[0] = {
+                .name = "C1",
+                .desc = "WFI",
+                .exit_latency = 1,
+                .target_residency = 1 * 2,
+                .flags = CPUIDLE_FLAG_TIME_VALID,
+        },
+        .safe_state_index = 0, /* C1 */
+        .state_count = 1,
 };
 
-void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
+void (*shmobile_cpuidle_setup)(struct cpuidle_driver *drv);
 
 static int shmobile_cpuidle_init(void)
 {
         struct cpuidle_device *dev = &shmobile_cpuidle_dev;
-        struct cpuidle_state *state;
+        struct cpuidle_driver *drv = &shmobile_cpuidle_driver;
         int i;
 
-        cpuidle_register_driver(&shmobile_cpuidle_driver);
-
-        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                dev->states[i].name[0] = '\0';
-                dev->states[i].desc[0] = '\0';
-                dev->states[i].enter = shmobile_cpuidle_enter;
-        }
-
-        i = CPUIDLE_DRIVER_STATE_START;
-
-        state = &dev->states[i++];
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
-        strncpy(state->desc, "WFI", CPUIDLE_DESC_LEN);
-        state->exit_latency = 1;
-        state->target_residency = 1 * 2;
-        state->power_usage = 3;
-        state->flags = 0;
-        state->flags |= CPUIDLE_FLAG_TIME_VALID;
-
-        dev->safe_state = state;
-        dev->state_count = i;
+        for (i = 0; i < CPUIDLE_STATE_MAX; i++)
+                drv->states[i].enter = shmobile_cpuidle_enter;
 
         if (shmobile_cpuidle_setup)
-                shmobile_cpuidle_setup(dev);
+                shmobile_cpuidle_setup(drv);
+
+        cpuidle_register_driver(drv);
 
+        dev->state_count = drv->state_count;
         cpuidle_register_device(dev);
 
         return 0;