summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.or>2013-04-17 13:32:55 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-22 00:35:52 +0200
commit194db92fd20cd7733f1ee06b330af93e10dfe727 (patch)
tree11b6427fb2b75714b5d2a8609e68ae442e07b224 /arch/sh
parent055d752f85f18abb2ad7e2193f61afefe36fd452 (diff)
downloadop-kernel-dev-194db92fd20cd7733f1ee06b330af93e10dfe727.zip
op-kernel-dev-194db92fd20cd7733f1ee06b330af93e10dfe727.tar.gz
SH: cpuidle: remove CPUIDLE_DRIVER_STATE_START usage
The CPUIDLE_DRIVER_STATE_START constant is only set when the kernel compilation option CONFIG_ARCH_HAS_CPU_RELAX is set, but this is only relatated to x86, so it is always zero. Remove the reference to this constant in the code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/shmobile/cpuidle.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index 34bb546..4b27701 100644
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -63,9 +63,7 @@ void sh_mobile_setup_cpuidle(void)
struct cpuidle_device *dev = &cpuidle_dev;
struct cpuidle_driver *drv = &cpuidle_driver;
struct cpuidle_state *state;
- int i;
-
- i = CPUIDLE_DRIVER_STATE_START;
+ int i = 0;
state = &drv->states[i++];
snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
@@ -77,7 +75,7 @@ void sh_mobile_setup_cpuidle(void)
state->flags |= CPUIDLE_FLAG_TIME_VALID;
state->enter = cpuidle_sleep_enter;
- drv->safe_state_index = i-1;
+ drv->safe_state_index = 0;
if (sh_mobile_sleep_supported & SUSP_SH_SF) {
state = &drv->states[i++];
OpenPOWER on IntegriCloud