From patchwork Thu Dec 17 02:15:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 68483 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI4ixrq005715 for ; Fri, 18 Dec 2009 04:47:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933125AbZLQCJH (ORCPT ); Wed, 16 Dec 2009 21:09:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763923AbZLQCJE (ORCPT ); Wed, 16 Dec 2009 21:09:04 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:43915 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763887AbZLQCIt (ORCPT ); Wed, 16 Dec 2009 21:08:49 -0500 Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id nBH28jUf009759 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Dec 2009 20:08:46 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id nBH28j4Y007528; Wed, 16 Dec 2009 20:08:45 -0600 (CST) Received: from Matrix (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nBH28iZ21641; Wed, 16 Dec 2009 20:08:44 -0600 (CST) Received: by Matrix (Postfix, from userid 1003) id 9ECAD1661E9; Wed, 16 Dec 2009 20:16:04 -0600 (CST) From: Omar Ramirez Luna To: linux-omap Cc: Hiroshi Doyu , Ameya Palande , Felipe Contreras , Fernando Guzman , Ernesto Ramos , Omar Ramirez Luna Subject: [PATCHv2 09/18] DSPBRIDGE: Rename usCount to timeout Date: Wed, 16 Dec 2009 20:15:54 -0600 Message-Id: <1261016163-11091-10-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1261016163-11091-9-git-send-email-omar.ramirez@ti.com> References: <1261016163-11091-1-git-send-email-omar.ramirez@ti.com> <1261016163-11091-2-git-send-email-omar.ramirez@ti.com> <1261016163-11091-3-git-send-email-omar.ramirez@ti.com> <1261016163-11091-4-git-send-email-omar.ramirez@ti.com> <1261016163-11091-5-git-send-email-omar.ramirez@ti.com> <1261016163-11091-6-git-send-email-omar.ramirez@ti.com> <1261016163-11091-7-git-send-email-omar.ramirez@ti.com> <1261016163-11091-8-git-send-email-omar.ramirez@ti.com> <1261016163-11091-9-git-send-email-omar.ramirez@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c index 018a5f4..65a21b2 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430.c +++ b/drivers/dsp/bridge/wmd/tiomap3430.c @@ -2089,14 +2089,14 @@ void configureDspMmu(struct WMD_DEV_CONTEXT *pDevContext, u32 dataBasePhys, */ bool WaitForStart(struct WMD_DEV_CONTEXT *pDevContext, u32 dwSyncAddr) { - u16 usCount = TIHELEN_ACKTIMEOUT; + u16 timeout = TIHELEN_ACKTIMEOUT; /* Wait for response from board */ - while (*((volatile u16 *)dwSyncAddr) && --usCount) + while (*((volatile u16 *)dwSyncAddr) && --timeout) udelay(10); /* If timed out: return FALSE */ - if (!usCount) { + if (!timeout) { DBG_Trace(DBG_LEVEL7, "Timed out Waiting for DSP to Start\n"); return FALSE; } diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index da59e4b..ea299a0 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -110,7 +110,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) { DSP_STATUS status = DSP_SOK; #ifdef CONFIG_PM - u16 usCount = PWRSTST_TIMEOUT / 10; + u16 timeout = PWRSTST_TIMEOUT / 10; struct CFG_HOSTRES resources; enum HW_PwrState_t pwrState; #ifdef CONFIG_BRIDGE_DVFS @@ -128,7 +128,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); /* Wait for DSP to move into OFF state */ - while ((pwrState != HW_PWR_STATE_OFF) && --usCount) { + while ((pwrState != HW_PWR_STATE_OFF) && --timeout) { if (msleep_interruptible(10)) { pr_err("Waiting for DSP OFF mode interrupted\n"); return DSP_EFAIL; @@ -136,7 +136,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); } - if (usCount == 0) { + if (timeout == 0) { DBG_Trace(DBG_LEVEL7, "Timed out Waiting for DSP Off mode \n"); status = WMD_E_TIMEOUT; return status; @@ -197,7 +197,7 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, #ifdef CONFIG_BRIDGE_NTFY_PWRERR struct DEH_MGR *hDehMgr; #endif /* CONFIG_BRIDGE_NTFY_PWRERR */ - u16 usCount = PWRSTST_TIMEOUT / 10; + u16 timeout = PWRSTST_TIMEOUT / 10; enum HW_PwrState_t pwrState, targetPwrState; DBG_Trace(DBG_LEVEL7, "SleepDSP- Enter function \n"); @@ -259,7 +259,7 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, &pwrState); /* Wait for DSP to move into target power state */ - while ((pwrState != targetPwrState) && usCount--) { + while ((pwrState != targetPwrState) && timeout--) { if (msleep_interruptible(10)) { pr_err("Waiting for DSP to Suspend interrupted\n"); return DSP_EFAIL; @@ -268,7 +268,7 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, &pwrState); } - if (!usCount) { + if (!timeout) { DBG_Trace(DBG_LEVEL7, "SleepDSP: Timed out Waiting for DSP" " STANDBY %x \n", pwrState); #ifdef CONFIG_BRIDGE_NTFY_PWRERR