From mboxrd@z Thu Jan 1 00:00:00 1970 From: jean.pihet@newoldbits.com (Jean Pihet) Date: Thu, 14 Jun 2012 17:05:57 +0200 Subject: [PATCH 06/10] ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state In-Reply-To: <1339686361-11526-1-git-send-email-j-pihet@ti.com> References: <1339686361-11526-1-git-send-email-j-pihet@ti.com> Message-ID: <1339686361-11526-7-git-send-email-j-pihet@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org If the next state is no found in the next_valid_state function, fallback to the default value of C1 (which is state 0). This prevents the use of a bogus state -1 in the rest of the cpuidle code. Signed-off-by: Jean Pihet --- arch/arm/mach-omap2/cpuidle34xx.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 1f33b8e..9319f94 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -186,7 +186,7 @@ static int next_valid_state(struct cpuidle_device *dev, u32 mpu_pm_qos_next_state = mpu_pd->wkup_lat_next_state; u32 core_pm_qos_next_state = core_pd->wkup_lat_next_state; int idx; - int next_index = -1; + int next_index = 0; /* C1 is the default value */ if (enable_off_mode) { mpu_deepest_state = PWRDM_FUNC_PWRST_OFF; @@ -221,12 +221,6 @@ static int next_valid_state(struct cpuidle_device *dev, } } - /* - * C1 is always valid. - * So, no need to check for 'next_index == -1' outside - * this loop. - */ - return next_index; } -- 1.7.7.6