aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/cpuidle44xx.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 9e3effa59b9a..f1410f1db1f5 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -24,7 +24,7 @@
24 24
25#ifdef CONFIG_CPU_IDLE 25#ifdef CONFIG_CPU_IDLE
26 26
27/* Machine specific information to be recorded in the C-state driver_data */ 27/* Machine specific information */
28struct omap4_idle_statedata { 28struct omap4_idle_statedata {
29 u32 cpu_state; 29 u32 cpu_state;
30 u32 mpu_logic_state; 30 u32 mpu_logic_state;
@@ -65,8 +65,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
65 struct cpuidle_driver *drv, 65 struct cpuidle_driver *drv,
66 int index) 66 int index)
67{ 67{
68 struct omap4_idle_statedata *cx = 68 struct omap4_idle_statedata *cx = &omap4_idle_data[index];
69 cpuidle_get_statedata(&dev->states_usage[index]);
70 u32 cpu1_state; 69 u32 cpu1_state;
71 int cpu_id = smp_processor_id(); 70 int cpu_id = smp_processor_id();
72 71
@@ -83,7 +82,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
83 cpu1_state = pwrdm_read_pwrst(cpu1_pd); 82 cpu1_state = pwrdm_read_pwrst(cpu1_pd);
84 if (cpu1_state != PWRDM_POWER_OFF) { 83 if (cpu1_state != PWRDM_POWER_OFF) {
85 index = drv->safe_state_index; 84 index = drv->safe_state_index;
86 cx = cpuidle_get_statedata(&dev->states_usage[index]); 85 cx = &omap4_idle_data[index];
87 } 86 }
88 87
89 if (index > 0) 88 if (index > 0)
@@ -176,15 +175,9 @@ static inline struct omap4_idle_statedata *_fill_cstate_usage(
176 int idx) 175 int idx)
177{ 176{
178 struct omap4_idle_statedata *cx = &omap4_idle_data[idx]; 177 struct omap4_idle_statedata *cx = &omap4_idle_data[idx];
179 struct cpuidle_state_usage *state_usage = &dev->states_usage[idx];
180
181 cpuidle_set_statedata(state_usage, cx);
182
183 return cx; 178 return cx;
184} 179}
185 180
186
187
188/** 181/**
189 * omap4_idle_init - Init routine for OMAP4 idle 182 * omap4_idle_init - Init routine for OMAP4 idle
190 * 183 *