1 files changed, 16 insertions, 14 deletions

diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c
index 358dd80b3a07..ffd690dc3d33 100644
--- a/arch/arm/mach-kirkwood/cpuidle.c
+++ b/arch/arm/mach-kirkwood/cpuidle.c
@@ -32,6 +32,7 @@ static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
 
 /* Actual code that puts the SoC in different idle states */
 static int kirkwood_enter_idle(struct cpuidle_device *dev,
+                                struct cpuidle_driver *drv,
                                int index)
 {
         struct timeval before, after;
@@ -68,28 +69,29 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
 static int kirkwood_init_cpuidle(void)
 {
         struct cpuidle_device *device;
-
-        cpuidle_register_driver(&kirkwood_idle_driver);
+        struct cpuidle_driver *driver = &kirkwood_idle_driver;
 
         device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
         device->state_count = KIRKWOOD_MAX_STATES;
+        driver->state_count = KIRKWOOD_MAX_STATES;
 
         /* Wait for interrupt state */
-        device->states[0].enter = kirkwood_enter_idle;
-        device->states[0].exit_latency = 1;
-        device->states[0].target_residency = 10000;
-        device->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[0].name, "WFI");
-        strcpy(device->states[0].desc, "Wait for interrupt");
+        driver->states[0].enter = kirkwood_enter_idle;
+        driver->states[0].exit_latency = 1;
+        driver->states[0].target_residency = 10000;
+        driver->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[0].name, "WFI");
+        strcpy(driver->states[0].desc, "Wait for interrupt");
 
         /* Wait for interrupt and DDR self refresh state */
-        device->states[1].enter = kirkwood_enter_idle;
-        device->states[1].exit_latency = 10;
-        device->states[1].target_residency = 10000;
-        device->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[1].name, "DDR SR");
-        strcpy(device->states[1].desc, "WFI and DDR Self Refresh");
+        driver->states[1].enter = kirkwood_enter_idle;
+        driver->states[1].exit_latency = 10;
+        driver->states[1].target_residency = 10000;
+        driver->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[1].name, "DDR SR");
+        strcpy(driver->states[1].desc, "WFI and DDR Self Refresh");
 
+        cpuidle_register_driver(&kirkwood_idle_driver);
         if (cpuidle_register_device(device)) {
                 printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n");
                 return -EIO;