From patchwork Sat Mar 27 02:29:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Shivananda" X-Patchwork-Id: 88675 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 o2R2ThJe015222 for ; Sat, 27 Mar 2010 02:29:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753198Ab0C0C3L (ORCPT ); Fri, 26 Mar 2010 22:29:11 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:52131 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958Ab0C0C3I convert rfc822-to-8bit (ORCPT ); Fri, 26 Mar 2010 22:29:08 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2R2T5Oc011941 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 26 Mar 2010 21:29:08 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o2R2T5jO026695 for ; Sat, 27 Mar 2010 07:59:05 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Sat, 27 Mar 2010 07:59:05 +0530 From: "Hebbar, Shivananda" To: "linux-omap@vger.kernel.org" Date: Sat, 27 Mar 2010 07:59:03 +0530 Subject: [RFC][PATCH v1 17/19] DSPBRIDGE: Cleanup custom error code (CHNL_E_CHANBUSY -> -EALREADY) Thread-Topic: [RFC][PATCH v1 17/19] DSPBRIDGE: Cleanup custom error code (CHNL_E_CHANBUSY -> -EALREADY) Thread-Index: AcrNVURgYhZxYF/nTx6akM3tyPo5NA== Message-ID: <19F8576C6E063C45BE387C64729E7394044DEBEE17@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]); Sat, 27 Mar 2010 02:29:44 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h index e564284..51e9407 100644 --- a/arch/arm/plat-omap/include/dspbridge/errbase.h +++ b/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -293,9 +293,6 @@ /* Channel ID is out of range. */ #define CHNL_E_BADCHANID (CHNL_EBASE + 0x03) -/* Channel is already in use. */ -#define CHNL_E_CHANBUSY (CHNL_EBASE + 0x04) - /* Invalid channel mode argument. */ #define CHNL_E_BADMODE (CHNL_EBASE + 0x05) diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h index 339acfd..e368bbc 100644 --- a/arch/arm/plat-omap/include/dspbridge/wmd.h +++ b/arch/arm/plat-omap/include/dspbridge/wmd.h @@ -394,7 +394,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr, * -EINVAL: Invalid number of IOReqs. * CHNL_E_OUTOFSTREAMS: No free channels available. * CHNL_E_BADCHANID: Channel ID is out of range. - * CHNL_E_CHANBUSY: Channel is in use. + * -EALREADY: Channel is in use. * CHNL_E_NOIORPS: No free IO request packets available for * queuing. * Requires: diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index b78360f..45a15b4 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -596,7 +596,7 @@ func_cont: */ DBC_ASSERT(status == CHNL_E_OUTOFSTREAMS || status == CHNL_E_BADCHANID || - status == CHNL_E_CHANBUSY || + status == -EALREADY || status == CHNL_E_NOIORPS); status = DSP_EFAIL; } diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index 63ffc34..d3e59d3 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -811,7 +811,7 @@ dsp_status bridge_chnl_open(OUT struct chnl_object **phChnl, status = CHNL_E_BADCHANID; else if (chnl_mgr_obj->ap_channel[uChnlId] != NULL) - status = CHNL_E_CHANBUSY; + status = -EALREADY; } else { /* Check for free channel */ status =