aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2012-04-24 10:05:22 -0400
committerKevin Hilman <khilman@ti.com>2012-05-03 14:00:27 -0400
commit65d284d5730aba77d91cb52ca64b649e1aee1210 (patch)
treebf0d431c0115f39fb92db0742bf5a323006d50c5 /arch/arm/mach-omap2
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
ARM: OMAP4: cpuidle - Remove unused valid field
The 'valid' field is never used in the code, let's remove it. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Jean Pihet <j-pihet@ti.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/cpuidle44xx.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index f386cbe9c889..ee0bc508bcd2 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -29,16 +29,15 @@ struct omap4_idle_statedata {
29 u32 cpu_state; 29 u32 cpu_state;
30 u32 mpu_logic_state; 30 u32 mpu_logic_state;
31 u32 mpu_state; 31 u32 mpu_state;
32 u8 valid;
33}; 32};
34 33
35static struct cpuidle_params cpuidle_params_table[] = { 34static struct cpuidle_params cpuidle_params_table[] = {
36 /* C1 - CPU0 ON + CPU1 ON + MPU ON */ 35 /* C1 - CPU0 ON + CPU1 ON + MPU ON */
37 {.exit_latency = 2 + 2 , .target_residency = 5, .valid = 1}, 36 {.exit_latency = 2 + 2 , .target_residency = 5 },
38 /* C2- CPU0 OFF + CPU1 OFF + MPU CSWR */ 37 /* C2- CPU0 OFF + CPU1 OFF + MPU CSWR */
39 {.exit_latency = 328 + 440 , .target_residency = 960, .valid = 1}, 38 {.exit_latency = 328 + 440 , .target_residency = 960 },
40 /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */ 39 /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
41 {.exit_latency = 460 + 518 , .target_residency = 1100, .valid = 1}, 40 {.exit_latency = 460 + 518 , .target_residency = 1100 },
42}; 41};
43 42
44#define OMAP4_NUM_STATES ARRAY_SIZE(cpuidle_params_table) 43#define OMAP4_NUM_STATES ARRAY_SIZE(cpuidle_params_table)
@@ -155,7 +154,6 @@ static inline struct omap4_idle_statedata *_fill_cstate_usage(
155 struct omap4_idle_statedata *cx = &omap4_idle_data[idx]; 154 struct omap4_idle_statedata *cx = &omap4_idle_data[idx];
156 struct cpuidle_state_usage *state_usage = &dev->states_usage[idx]; 155 struct cpuidle_state_usage *state_usage = &dev->states_usage[idx];
157 156
158 cx->valid = cpuidle_params_table[idx].valid;
159 cpuidle_set_statedata(state_usage, cx); 157 cpuidle_set_statedata(state_usage, cx);
160 158
161 return cx; 159 return cx;
@@ -191,7 +189,6 @@ int __init omap4_idle_init(void)
191 _fill_cstate(drv, 0, "MPUSS ON"); 189 _fill_cstate(drv, 0, "MPUSS ON");
192 drv->safe_state_index = 0; 190 drv->safe_state_index = 0;
193 cx = _fill_cstate_usage(dev, 0); 191 cx = _fill_cstate_usage(dev, 0);
194 cx->valid = 1; /* C1 is always valid */
195 cx->cpu_state = PWRDM_POWER_ON; 192 cx->cpu_state = PWRDM_POWER_ON;
196 cx->mpu_state = PWRDM_POWER_ON; 193 cx->mpu_state = PWRDM_POWER_ON;
197 cx->mpu_logic_state = PWRDM_POWER_RET; 194 cx->mpu_logic_state = PWRDM_POWER_RET;