Hi Omar,
Sorry for the top posthing :(
I guess the original patch had empty if() bodies.
That comment can be removed :)
Cheers,
Ameya.
________________________________________
From: ext Omar Ramirez Luna [omar.ramirez@xxxxxx]
Sent: Monday, January 25, 2010 6:59 PM
To: Palande Ameya (Nokia-D/Helsinki)
Cc: linux-omap@xxxxxxxxxxxxxxx; Menon, Nishanth; Chitriki Rudramuni, Deepak; Kukkonen Mika (Nokia-D/Helsinki)
Subject: Re: [PATCH] DSPBRIDGE: Various compile warning fixes
Patch looks good, just one question:
> This patch contains indentation fixes and cleans up various warnings
> uncovered with extra warning flags:
>
> - empty if() bodies
am i missing something? which hunk fix this?
> - incorrect use of unsigned variables
> - bad comparison of pointer value
> - pointless check of unsigned value being smaller than zero
> - keyword 'extern' has to be first one in variable declaration
>
> Signed-off-by: Mika Kukkonen <mika.kukkonen@xxxxxxxxx>
> Signed-off-by: Ameya Palande <ameya.palande@xxxxxxxxx>
> ---
> arch/arm/plat-omap/include/dspbridge/dbc.h | 6 +++---
> arch/arm/plat-omap/include/dspbridge/dbg.h | 4 ++--
> arch/arm/plat-omap/include/dspbridge/gt.h | 16 +++++++++-------
> arch/arm/plat-omap/include/dspbridge/mem.h | 2 +-
> drivers/dsp/bridge/wmd/io_sm.c | 2 +-
> drivers/dsp/bridge/wmd/ue_deh.c | 2 +-
> 6 files changed, 17 insertions(+), 15 deletions(-)
>
> 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..64eba5a 100644
> --- a/drivers/dsp/bridge/wmd/io_sm.c
> +++ b/drivers/dsp/bridge/wmd/io_sm.c
> @@ -1210,7 +1210,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;
>
> -- 1.6.3.3
- omar
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
