WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx> CC: Nishant Menon <nm@xxxxxx> --- drivers/dsp/bridge/gen/gs.c | 3 +-- drivers/dsp/bridge/pmgr/cmm.c | 5 ++--- drivers/dsp/bridge/rmgr/node.c | 4 ++-- drivers/dsp/bridge/services/cfg.c | 10 +++++----- drivers/dsp/bridge/wmd/io_sm.c | 3 +-- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/dsp/bridge/gen/gs.c b/drivers/dsp/bridge/gen/gs.c index 5a5684c..7d6c278 100644 --- a/drivers/dsp/bridge/gen/gs.c +++ b/drivers/dsp/bridge/gen/gs.c @@ -87,7 +87,6 @@ void GS_init(void) { static bool curInit; - if (curInit == false) { + if (curInit == false) curInit = MEM_Init(); /* which can't fail currently. */ - } } diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c index 556749f..63d1dec 100644 --- a/drivers/dsp/bridge/pmgr/cmm.c +++ b/drivers/dsp/bridge/pmgr/cmm.c @@ -1044,11 +1044,10 @@ DSP_STATUS CMM_XlatorDelete(struct CMM_XLATOROBJECT *hXlator, bool bForce) DBC_Require(cRefs > 0); - if (MEM_IsValidHandle(pXlator, CMMXLATESIGNATURE)) { + if (MEM_IsValidHandle(pXlator, CMMXLATESIGNATURE)) MEM_FreeObject(pXlator); - } else { + else status = DSP_EHANDLE; - } return status; } diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index 19e12b3..006a079 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -2116,9 +2116,9 @@ bool NODE_Init(void) */ void NODE_OnExit(struct NODE_OBJECT *hNode, s32 nStatus) { - if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) { + if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) return; - } + /* Set node state to done */ NODE_SetState(hNode, NODE_DONE); hNode->nExitStatus = nStatus; diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c index 892577a..fcdf682 100644 --- a/drivers/dsp/bridge/services/cfg.c +++ b/drivers/dsp/bridge/services/cfg.c @@ -152,13 +152,13 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode, "Entered CFG_GetDSPResources, args: " "\n\thDevNode: 0x%x\n\tpDSPResTable: 0x%x\n", hDevNode, pDSPResTable); - if (!hDevNode) { + if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; - } else if (!pDSPResTable) { + else if (!pDSPResTable) status = CFG_E_INVALIDPOINTER; - } else { - status = REG_GetValue(DSPRESOURCES, (u8 *)pDSPResTable, &dwResSize); - } + else + status = REG_GetValue(DSPRESOURCES, (u8 *)pDSPResTable, + &dwResSize); if (DSP_SUCCEEDED(status)) { GT_0trace(CFG_debugMask, GT_1CLASS, "CFG_GetDSPResources SUCCESS\n"); diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index c541400..af31831 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -596,9 +596,8 @@ func_cont1: aEProc[ndx].ulGppVa, aEProc[ndx].ulDspVa * hIOMgr->uWordSize, pgSize[i]); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) goto func_end; - } } paCurr += pgSize[i]; vaCurr += pgSize[i]; -- 1.6.2.4 -- 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