From patchwork Sat Apr 17 02:10:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Uribe de Leon, Armando" X-Patchwork-Id: 93266 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.3) with ESMTP id o3H2ASel003419 for ; Sat, 17 Apr 2010 02:10:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758078Ab0DQCKV (ORCPT ); Fri, 16 Apr 2010 22:10:21 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:46023 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758054Ab0DQCKU convert rfc822-to-8bit (ORCPT ); Fri, 16 Apr 2010 22:10:20 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3H2AHah010196 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 16 Apr 2010 21:10:18 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3H2AHtB016197; Fri, 16 Apr 2010 21:10:17 -0500 (CDT) Received: from dlee75.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3H2AHDZ016177; Fri, 16 Apr 2010 21:10:17 -0500 (CDT) Received: from dlee04.ent.ti.com ([157.170.170.9]) by dlee75.ent.ti.com ([157.170.170.72]) with mapi; Fri, 16 Apr 2010 21:10:17 -0500 From: "Uribe de Leon, Armando" To: "linux-omap@vger.kernel.org" CC: "hiroshi.DOYU@nokia.com" , "ameya.palande@nokia.com" , "felipe.contreras@nokia.com" Date: Fri, 16 Apr 2010 21:10:15 -0500 Subject: [PATCH 1/5] DSPBRIDGE: Remove checkpatch errors regarding braces Thread-Topic: [PATCH 1/5] DSPBRIDGE: Remove checkpatch errors regarding braces Thread-Index: Acrd0x6fNOMBVu8BSYOcdKbxp1zD9A== Message-ID: <67059DBF19D7214F9C66BB0EA91BA90EC2622733@dlee04.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Apr 2010 02:10:29 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/mem.h b/arch/arm/plat-omap/include/dspbridge/mem.h index 087f69f..effba29 100644 --- a/arch/arm/plat-omap/include/dspbridge/mem.h +++ b/arch/arm/plat-omap/include/dspbridge/mem.h @@ -172,10 +172,10 @@ extern void mem_free_phys_mem(void *pVirtualAddress, * A subsequent call to MEM_IS_VALID_HANDLE() will fail for this object. */ #define MEM_FREE_OBJECT(pObj) \ -{ \ - pObj->dw_signature = 0x00; \ - kfree(pObj); \ -} +do { \ + pObj->dw_signature = 0x00; \ + kfree(pObj); \ +} while (0) /* * ======== mem_get_num_pages ======== diff --git a/drivers/dsp/bridge/dynload/cload.c b/drivers/dsp/bridge/dynload/cload.c index d0de525..7f3c3bd 100644 --- a/drivers/dsp/bridge/dynload/cload.c +++ b/drivers/dsp/bridge/dynload/cload.c @@ -48,8 +48,8 @@ static const char loader_dllview_root[] = { "?DLModules?" }; */ static const char readstrm[] = { "Error reading %s from input stream" }; static const char err_alloc[] = { "Syms->dload_allocate( %d ) failed" }; -static const char tgtalloc[] = - { "Target memory allocate failed, section %s size " FMT_UI32 }; +static const char tgtalloc[] = { + "Target memory allocate failed, section %s size " FMT_UI32 }; static const char initfail[] = { "%s to target address " FMT_UI32 " failed" }; static const char dlvwrite[] = { "Write to DLLview list failed" }; static const char iconnect[] = { "Connect call to init interface failed" }; diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c index 7523361..8c770da 100644 --- a/drivers/dsp/bridge/pmgr/cmm.c +++ b/drivers/dsp/bridge/pmgr/cmm.c @@ -1010,11 +1010,10 @@ dsp_status cmm_xlator_delete(struct cmm_xlatorobject *xlator, bool bForce) DBC_REQUIRE(refs > 0); - if (MEM_IS_VALID_HANDLE(xlator_obj, CMMXLATESIGNATURE)) { + if (MEM_IS_VALID_HANDLE(xlator_obj, CMMXLATESIGNATURE)) MEM_FREE_OBJECT(xlator_obj); - } else { + else status = DSP_EHANDLE; - } return status; } diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c index 0e7c4a4..c983d6d 100644 --- a/drivers/dsp/bridge/pmgr/dbll.c +++ b/drivers/dsp/bridge/pmgr/dbll.c @@ -848,9 +848,8 @@ void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs) &zl_lib->symbol.dl_symbol, &zl_lib->allocate.dl_alloc, &zl_lib->init.dl_init); - if (err != 0) { + if (err != 0) dev_dbg(bridge, "%s: failed: 0x%x\n", __func__, err); - } } /* remove symbols from symbol table */ if (zl_lib->sym_tab != NULL) { diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index 1b5d977..0517f1a 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -578,9 +578,8 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr) ae_proc[ndx].ul_gpp_va, ae_proc[ndx].ul_dsp_va * hio_mgr->word_size, page_size[i]); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) goto func_end; - } } pa_curr += page_size[i]; va_curr += page_size[i]; diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 0b5d2f2..938d86d 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -228,9 +228,8 @@ dsp_status sleep_dsp(struct wmd_dev_context *dev_context, IN u32 dw_cmd, /* Turn off DSP Peripheral clocks */ status = dsp_peripheral_clocks_disable(dev_context, NULL); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) return status; - } #ifdef CONFIG_BRIDGE_DVFS else if (target_pwr_state == PWRDM_POWER_OFF) { struct dspbridge_platform_data *pdata = @@ -357,9 +356,8 @@ dsp_status dsp_peripheral_clk_ctrl(struct wmd_dev_context *dev_context,