From patchwork Thu Mar 12 21:17:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjeev Premi X-Patchwork-Id: 11532 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2CLHwkF023996 for ; Thu, 12 Mar 2009 21:17:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751012AbZCLVR6 (ORCPT ); Thu, 12 Mar 2009 17:17:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752551AbZCLVR6 (ORCPT ); Thu, 12 Mar 2009 17:17:58 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:34738 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751012AbZCLVR5 (ORCPT ); Thu, 12 Mar 2009 17:17:57 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n2CLHojg005040 for ; Thu, 12 Mar 2009 16:17:56 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id n2CLHmcf026884; Fri, 13 Mar 2009 02:47:48 +0530 (IST) From: Sanjeev Premi To: linux-omap@vger.kernel.org Cc: Sanjeev Premi Subject: [PATCHv2] PM: Start C-state definitions from base 0 Date: Fri, 13 Mar 2009 02:47:48 +0530 Message-Id: <1236892668-8710-1-git-send-email-premi@ti.com> X-Mailer: git-send-email 1.5.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The current definition of C-states starts from base 1. Whereas, the cpuidle driver uses base 0. This patch eliminates need for explicit mapping due to different base values. Signed-off-by: Sanjeev Premi --- arch/arm/mach-omap2/cpuidle34xx.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 62fbb2e..50bf412 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -33,13 +33,13 @@ #ifdef CONFIG_CPU_IDLE -#define OMAP3_MAX_STATES 7 -#define OMAP3_STATE_C1 1 /* C1 - MPU WFI + Core active */ -#define OMAP3_STATE_C2 2 /* C2 - MPU CSWR + Core active */ -#define OMAP3_STATE_C3 3 /* C3 - MPU OFF + Core active */ -#define OMAP3_STATE_C4 4 /* C4 - MPU RET + Core RET */ -#define OMAP3_STATE_C5 5 /* C5 - MPU OFF + Core RET */ -#define OMAP3_STATE_C6 6 /* C6 - MPU OFF + Core OFF */ +#define OMAP3_MAX_STATES 6 +#define OMAP3_STATE_C1 0 /* C1 - MPU WFI + Core active */ +#define OMAP3_STATE_C2 1 /* C2 - MPU CSWR + Core active */ +#define OMAP3_STATE_C3 2 /* C3 - MPU OFF + Core active */ +#define OMAP3_STATE_C4 3 /* C4 - MPU RET + Core RET */ +#define OMAP3_STATE_C5 4 /* C5 - MPU OFF + Core RET */ +#define OMAP3_STATE_C6 5 /* C6 - MPU OFF + Core OFF */ struct omap3_processor_cx { u8 valid; @@ -228,7 +228,7 @@ struct cpuidle_driver omap3_idle_driver = { */ int omap3_idle_init(void) { - int i, count = 0; + int count; struct omap3_processor_cx *cx; struct cpuidle_state *state; struct cpuidle_device *dev; @@ -244,8 +244,8 @@ int omap3_idle_init(void) dev = &per_cpu(omap3_idle_dev, smp_processor_id()); - for (i = 1; i < OMAP3_MAX_STATES; i++) { - cx = &omap3_power_states[i]; + for (count = 0; count < OMAP3_MAX_STATES; count++) { + cx = &omap3_power_states[count]; state = &dev->states[count]; if (!cx->valid) @@ -259,11 +259,8 @@ int omap3_idle_init(void) if (cx->type == OMAP3_STATE_C1) dev->safe_state = state; sprintf(state->name, "C%d", count+1); - count++; } - if (!count) - return -EINVAL; dev->state_count = count; if (cpuidle_register_device(dev)) {