From patchwork Sat Jan 23 10:19:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 74890 X-Patchwork-Delegate: omar.ramirez@ti.com 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 o0NAKFBD029076 for ; Sat, 23 Jan 2010 10:20:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754531Ab0AWKUO (ORCPT ); Sat, 23 Jan 2010 05:20:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754609Ab0AWKUM (ORCPT ); Sat, 23 Jan 2010 05:20:12 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:37353 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754319Ab0AWKUK (ORCPT ); Sat, 23 Jan 2010 05:20:10 -0500 Received: by bwz27 with SMTP id 27so1661481bwz.21 for ; Sat, 23 Jan 2010 02:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=6HiK/bPanBkGKMtX5KBMkcgeQ2XqBIly/Qp9h90x1Y4=; b=netxpMca2jAjK3gnyoV46yRLYXVVz4lNqoB/vvchOW9vtCnFZb5kt0wQ1RhPcmWT2h MFV2SvnEsOe2esJlwLqolaTldPKnN3oaZhYtpdaYdjq8iaSnlwLBYOm9plJlqBZhrYCl I+Ueh765UuaRKKhRjJAEWAdsFbZ9ZxokUQaOA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=l40Rbvx+dkU+W+B48DOWOrbnRLEhLYFmM56eyKq29cx3ww1FYJiIEawXIIFWSelNaO s1w0d0iNvRkH0jhq5DP59GSingtM6zkHIzRknYNvX/3vDKUW7EcGTYK/DaLHB4bQ63AM qQceHl0JXPhHYiApzhorG/27axovwew6tTfU8= Received: by 10.204.42.6 with SMTP id q6mr394095bke.120.1264242008924; Sat, 23 Jan 2010 02:20:08 -0800 (PST) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 15sm1355013bwz.0.2010.01.23.02.20.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 23 Jan 2010 02:20:07 -0800 (PST) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Mika Kukkonen , Ameya Palande Subject: [PATCH 2/2] DSPBRIDGE: Various compile warning fixes Date: Sat, 23 Jan 2010 12:19:46 +0200 Message-Id: <1264241986-29071-3-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1264241986-29071-1-git-send-email-felipe.contreras@gmail.com> References: <1264241986-29071-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/plat-omap/include/dspbridge/dbc.h b/arch/arm/plat-omap/include/dspbridge/dbc.h index ac5d178..1b3ac44 100644 --- a/arch/arm/plat-omap/include/dspbridge/dbc.h +++ b/arch/arm/plat-omap/include/dspbridge/dbc.h @@ -43,9 +43,9 @@ #else -#define DBC_Assert(exp) -#define DBC_Require(exp) -#define DBC_Ensure(exp) +#define DBC_Assert(exp) {} +#define DBC_Require(exp) {} +#define DBC_Ensure(exp) {} #endif /* DEBUG */ diff --git a/arch/arm/plat-omap/include/dspbridge/dbg.h b/arch/arm/plat-omap/include/dspbridge/dbg.h index 2f61dab..4d01eca 100644 --- a/arch/arm/plat-omap/include/dspbridge/dbg.h +++ b/arch/arm/plat-omap/include/dspbridge/dbg.h @@ -80,9 +80,9 @@ extern DSP_STATUS DBG_Trace(IN u8 bLevel, IN char *pstrFormat, ...); #else -#define DBG_Exit(void) +#define DBG_Exit(void) do {} while (0) #define DBG_Init(void) true -#define DBG_Trace(bLevel, pstrFormat, args...) +#define DBG_Trace(bLevel, pstrFormat, args...) do {} while (0) #endif /* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */ diff --git a/arch/arm/plat-omap/include/dspbridge/gt.h b/arch/arm/plat-omap/include/dspbridge/gt.h index 6082d15..9097910 100644 --- a/arch/arm/plat-omap/include/dspbridge/gt.h +++ b/arch/arm/plat-omap/include/dspbridge/gt.h @@ -252,13 +252,15 @@ extern struct GT_Config _GT_params; #define GT_query(mask, class) false -#define GT_0trace(mask, class, format) -#define GT_1trace(mask, class, format, arg1) -#define GT_2trace(mask, class, format, arg1, arg2) -#define GT_3trace(mask, class, format, arg1, arg2, arg3) -#define GT_4trace(mask, class, format, arg1, arg2, arg3, arg4) -#define GT_5trace(mask, class, format, arg1, arg2, arg3, arg4, arg5) -#define GT_6trace(mask, class, format, arg1, arg2, arg3, arg4, arg5, arg6) +#define GT_0trace(mask, class, format) do {} while (0) +#define GT_1trace(mask, class, format, arg1) do {} while (0) +#define GT_2trace(mask, class, format, arg1, arg2) do {} while (0) +#define GT_3trace(mask, class, format, arg1, arg2, arg3) do {} while (0) +#define GT_4trace(mask, class, format, arg1, arg2, arg3, arg4) do {} while (0) +#define GT_5trace(mask, class, format, arg1, arg2, arg3, arg4, arg5) \ + do {} while (0) +#define GT_6trace(mask, class, format, arg1, arg2, arg3, arg4, arg5, arg6) \ + do {} while (0) #else /* GT_TRACE == 1 */ diff --git a/arch/arm/plat-omap/include/dspbridge/mem.h b/arch/arm/plat-omap/include/dspbridge/mem.h index 03b419a..353ffb0 100644 --- a/arch/arm/plat-omap/include/dspbridge/mem.h +++ b/arch/arm/plat-omap/include/dspbridge/mem.h @@ -286,7 +286,7 @@ * Ensures: * - pBaseAddr no longer points to a valid linear address. */ -#define MEM_UnmapLinearAddress(pBaseAddr) +#define MEM_UnmapLinearAddress(pBaseAddr) {} /* * ======== MEM_ExtPhysPoolInit ======== diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index e35ce57..587dc6c 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -221,8 +221,7 @@ DSP_STATUS WMD_IO_Create(OUT struct IO_MGR **phIOMgr, bridge_workqueue = create_workqueue("bridge_work-queue"); if (bridge_workqueue <= 0) - DBG_Trace(DBG_LEVEL1, "Workque Create failed 0x%d \n", - bridge_workqueue); + DBG_Trace(DBG_LEVEL1, "Workqueue creation failed!\n"); /* Allocate IO manager object */ MEM_AllocObject(pIOMgr, struct IO_MGR, IO_MGRSIGNATURE); @@ -1210,7 +1209,7 @@ static void InputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, pChnlMgr->uWordSize; chnlId = IO_GetValue(pIOMgr->hWmdContext, struct SHM, sm, inputId); dwArg = IO_GetLong(pIOMgr->hWmdContext, struct SHM, sm, arg); - if (!(chnlId >= 0) || !(chnlId < CHNL_MAXCHANNELS)) { + if (chnlId >= CHNL_MAXCHANNELS) { /* Shouldn't be here: would indicate corrupted SHM. */ DBC_Assert(chnlId); goto func_end; diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c index 6166d97..2c3a2cd 100644 --- a/drivers/dsp/bridge/wmd/ue_deh.c +++ b/drivers/dsp/bridge/wmd/ue_deh.c @@ -189,7 +189,7 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, DSP_STATUS status = DSP_SOK; u32 memPhysical = 0; u32 HW_MMU_MAX_TLB_COUNT = 31; - u32 extern faultAddr; + extern u32 faultAddr; struct CFG_HOSTRES resources; HW_STATUS hwStatus;