From patchwork Wed Feb 3 00:44:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Shivananda" X-Patchwork-Id: 76559 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 o130iHJv007586 for ; Wed, 3 Feb 2010 00:44:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756182Ab0BCAoR (ORCPT ); Tue, 2 Feb 2010 19:44:17 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:44204 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756056Ab0BCAoQ convert rfc822-to-8bit (ORCPT ); Tue, 2 Feb 2010 19:44:16 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o130iDVU025826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Feb 2010 18:44:15 -0600 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o130iC86009278 for ; Wed, 3 Feb 2010 06:14:12 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Wed, 3 Feb 2010 06:14:12 +0530 From: "Hebbar, Shivananda" To: linux-omap Date: Wed, 3 Feb 2010 06:14:11 +0530 Subject: [Patch 8/8] DSPBRIDGE: typedef cleanup -CHNL_MODE Thread-Topic: [Patch 8/8] DSPBRIDGE: typedef cleanup -CHNL_MODE Thread-Index: AcqkagBGnMuYGdIKQsGGhCeRKIeWHw== Message-ID: <19F8576C6E063C45BE387C64729E7394044A6B9678@dbde02.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]); Wed, 03 Feb 2010 00:44:18 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/chnldefs.h b/arch/arm/plat-omap/include/dspbridge/chnldefs.h index be405ba..43df8b7 100644 --- a/arch/arm/plat-omap/include/dspbridge/chnldefs.h +++ b/arch/arm/plat-omap/include/dspbridge/chnldefs.h @@ -45,8 +45,6 @@ #define CHNL_IsIOCancelled(ioc) (ioc.status & CHNL_IOCSTATCANCEL) #define CHNL_IsTimedOut(ioc) (ioc.status & CHNL_IOCSTATTIMEOUT) -/* CHNL types: */ - typedef u32 CHNL_MODE; /* Channel transfer mode. */ /* Channel attributes: */ struct CHNL_ATTRS { diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h index 70f3970..95c79f2 100644 --- a/arch/arm/plat-omap/include/dspbridge/wmd.h +++ b/arch/arm/plat-omap/include/dspbridge/wmd.h @@ -418,7 +418,7 @@ typedef DSP_STATUS(*WMD_BRD_WRITE)(struct WMD_DEV_CONTEXT *hDevContext, typedef DSP_STATUS(*WMD_CHNL_OPEN) (OUT struct CHNL_OBJECT **phChnl, struct CHNL_MGR *hChnlMgr, - CHNL_MODE uMode, + short int chnlMode, u32 uChnlId, CONST IN OPTIONAL struct CHNL_ATTRS *pAttrs); diff --git a/arch/arm/plat-omap/include/dspbridge/wmdchnl.h b/arch/arm/plat-omap/include/dspbridge/wmdchnl.h index 4b733d8..9e73516 100644 --- a/arch/arm/plat-omap/include/dspbridge/wmdchnl.h +++ b/arch/arm/plat-omap/include/dspbridge/wmdchnl.h @@ -33,7 +33,7 @@ extern DSP_STATUS WMD_CHNL_Open(OUT struct CHNL_OBJECT **phChnl, struct CHNL_MGR *hChnlMgr, - CHNL_MODE uMode, + short int chnlMode, u32 uChnlId, CONST IN OPTIONAL struct CHNL_ATTRS *pAttrs); diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index 5352923..538c806 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -895,7 +895,7 @@ DSP_STATUS NODE_Connect(struct NODE_OBJECT *hNode1, u32 uStream1, struct STREAM *pStream; GB_BitNum pipeId = GB_NOBITS; GB_BitNum chnlId = GB_NOBITS; - CHNL_MODE uMode; + short int uMode; u32 dwLength; DSP_STATUS status = DSP_SOK; DBC_Require(cRefs > 0); diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index febb6c2..f03064e 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -524,7 +524,7 @@ DSP_STATUS STRM_Open(struct NODE_OBJECT *hNode, u32 uDir, u32 uIndex, struct WMD_DRV_INTERFACE *pIntfFxns; u32 ulChnlId; struct STRM_OBJECT *pStrm = NULL; - CHNL_MODE uMode; + short int uMode; struct CHNL_ATTRS chnlAttrs; DSP_STATUS status = DSP_SOK; struct CMM_OBJECT *hCmmMgr = NULL; /* Shared memory manager hndl */ diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index ca5662d..5d3f71e 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -253,7 +253,7 @@ DSP_STATUS WMD_CHNL_CancelIO(struct CHNL_OBJECT *hChnl) DSP_STATUS status = DSP_SOK; struct CHNL_OBJECT *pChnl = (struct CHNL_OBJECT *)hChnl; u32 iChnl = -1; - CHNL_MODE uMode; + short int chnlMode; struct CHNL_IRP *pChirp; struct CHNL_MGR *pChnlMgr = NULL; @@ -483,7 +483,7 @@ DSP_STATUS WMD_CHNL_FlushIO(struct CHNL_OBJECT *hChnl, u32 dwTimeOut) { DSP_STATUS status = DSP_SOK; struct CHNL_OBJECT *pChnl = (struct CHNL_OBJECT *)hChnl; - CHNL_MODE uMode = -1; + short int chnlMode = -1; struct CHNL_MGR *pChnlMgr; struct CHNL_IOC chnlIOC; /* Check args: */ @@ -758,7 +758,7 @@ DSP_STATUS WMD_CHNL_GetMgrInfo(struct CHNL_MGR *hChnlMgr, u32 uChnlID, DSP_STATUS WMD_CHNL_Idle(struct CHNL_OBJECT *hChnl, u32 dwTimeOut,