cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-exynos4 / cpuidle.c

diff --git a/arch/arm/mach-exynos4/cpuidle.c b/arch/arm/mach-exynos4/cpuidle.c
index bf7e96f2793a009fe4c96706d6022c1a63a0199d..ea026e72b977ad16133f0b94ca56b75b4cf323ea 100644 (file)
--- a/arch/arm/mach-exynos4/cpuidle.c
+++ b/arch/arm/mach-exynos4/cpuidle.c
@@ -16,7 +16,7 @@
 #include <asm/proc-fns.h>
 
 static int exynos4_enter_idle(struct cpuidle_device *dev,
-                             struct cpuidle_state *state);
+                             int index);
 
 static struct cpuidle_state exynos4_cpuidle_set[] = {
        [0] = {
@@ -37,7 +37,7 @@ static struct cpuidle_driver exynos4_idle_driver = {
 };
 
 static int exynos4_enter_idle(struct cpuidle_device *dev,
-                             struct cpuidle_state *state)
+                             int index)
 {
        struct timeval before, after;
        int idle_time;
@@ -52,7 +52,8 @@ static int exynos4_enter_idle(struct cpuidle_device *dev,
        idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
                    (after.tv_usec - before.tv_usec);
 
-       return idle_time;
+       dev->last_residency = idle_time;
+       return index;
 }
 
 static int __init exynos4_init_cpuidle(void)