From patchwork Wed Sep 23 12:06:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ameya Palande X-Patchwork-Id: 49521 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 n8NC6Wq9027258 for ; Wed, 23 Sep 2009 12:06:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbZIWMG1 (ORCPT ); Wed, 23 Sep 2009 08:06:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752574AbZIWMG1 (ORCPT ); Wed, 23 Sep 2009 08:06:27 -0400 Received: from smtp.nokia.com ([192.100.105.134]:19714 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752212AbZIWMG1 (ORCPT ); Wed, 23 Sep 2009 08:06:27 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n8NC5Ex8001907; Wed, 23 Sep 2009 07:05:41 -0500 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 23 Sep 2009 15:06:14 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 23 Sep 2009 15:06:13 +0300 Received: from localhost.localdomain (esdhcp04089.research.nokia.com [172.21.40.89]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n8NC63gF016991; Wed, 23 Sep 2009 15:06:03 +0300 From: Ameya Palande To: linux-omap@vger.kernel.org Cc: omar.ramirez@ti.com Subject: [PATCH] DSPBRIDGE: Get rid of mixed declaration code warning Date: Wed, 23 Sep 2009 15:06:09 +0300 Message-Id: <1253707569-8160-1-git-send-email-ameya.palande@nokia.com> X-Mailer: git-send-email 1.6.2.4 X-OriginalArrivalTime: 23 Sep 2009 12:06:13.0450 (UTC) FILETIME=[3EEBD2A0:01CA3C46] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch fixes following compiler warning: drivers/dsp/bridge/rmgr/proc.c:1072: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Ameya Palande --- drivers/dsp/bridge/rmgr/proc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index a75b64a..b979c85 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -1058,20 +1058,24 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, #ifdef DEBUG BRD_STATUS uBrdState; #endif + #ifdef OPT_LOAD_TIME_INSTRUMENTATION struct timeval tv1; struct timeval tv2; #endif + +#if defined(CONFIG_BRIDGE_DVFS) && !defined(CONFIG_CPU_FREQ) + struct dspbridge_platform_data *pdata = + omap_dspbridge_dev->dev.platform_data; +#endif + DBC_Require(cRefs > 0); DBC_Require(iArgc > 0); DBC_Require(aArgv != NULL); + #ifdef OPT_LOAD_TIME_INSTRUMENTATION do_gettimeofday(&tv1); #endif -#if defined(CONFIG_BRIDGE_DVFS) && !defined(CONFIG_CPU_FREQ) - struct dspbridge_platform_data *pdata = - omap_dspbridge_dev->dev.platform_data; -#endif GT_2trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Load, args:\n\t" "hProcessor: 0x%x\taArgv: 0x%x\n", hProcessor, aArgv[0]); /* Call the WMD_BRD_Load Fxn */