From patchwork Thu Jun 3 05:47:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103978 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 o535uMcl018388 for ; Thu, 3 Jun 2010 05:56:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932580Ab0FCF4Y (ORCPT ); Thu, 3 Jun 2010 01:56:24 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:37595 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034Ab0FCF4R (ORCPT ); Thu, 3 Jun 2010 01:56:17 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uEhJ031697 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:15 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o535uBNW004636; Thu, 3 Jun 2010 00:56:12 -0500 (CDT) Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o535uBP27830; Thu, 3 Jun 2010 00:56:11 -0500 (CDT) From: Omar Ramirez Luna To: linux-omap Cc: Omar Ramirez Luna , Shivananda Hebbar , Hiroshi DOYU , Fernando Guzman Lugo , Ivan Gomez Castellanos , Ernesto Ramos , Armando Uribe De Leon , Ameya Palande , Felipe Contreras Subject: [PATCH 14/40] DSPBRIDGE: err code replace CHNL_E_BADCHANID with ECHRNG Date: Thu, 3 Jun 2010 00:47:27 -0500 Message-Id: <1275544073-20418-15-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com> References: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com> 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]); Thu, 03 Jun 2010 05:56:27 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h index b268c5e..c4b0922 100644 --- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h +++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h @@ -393,7 +393,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr, * -ENOMEM: Insufficient memory for requested resources. * -EINVAL: Invalid number of IOReqs. * CHNL_E_OUTOFSTREAMS: No free channels available. - * CHNL_E_BADCHANID: Channel ID is out of range. + * -ECHRNG: Channel ID is out of range. * -EALREADY: Channel is in use. * -EIO: No free IO request packets available for * queuing. @@ -577,7 +577,7 @@ typedef dsp_status(*fxn_chnl_getinfo) (struct chnl_object *chnl_obj, * 0: Success; * -EFAULT: Invalid hchnl_mgr. * -EFAULT: pMgrInfo == NULL. - * CHNL_E_BADCHANID: Invalid channel ID. + * -ECHRNG: Invalid channel ID. * Requires: * Ensures: * 0: pMgrInfo points to a filled in chnl_mgrinfo diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c index 806f0c9..db03db6 100644 --- a/drivers/dsp/bridge/core/chnl_sm.c +++ b/drivers/dsp/bridge/core/chnl_sm.c @@ -736,7 +736,7 @@ dsp_status bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 uChnlID, status = -EFAULT; } } else { - status = CHNL_E_BADCHANID; + status = -ECHRNG; } } else { status = -EFAULT; @@ -801,7 +801,7 @@ dsp_status bridge_chnl_open(OUT struct chnl_object **phChnl, } else { if (uChnlId != CHNL_PICKFREE) { if (uChnlId >= chnl_mgr_obj->max_channels) - status = CHNL_E_BADCHANID; + status = -ECHRNG; else if (chnl_mgr_obj->ap_channel[uChnlId] != NULL) status = -EALREADY; diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index accfb7b..c31a5c1 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -585,7 +585,7 @@ func_cont: * assert here), and then return -EPERM. */ DBC_ASSERT(status == CHNL_E_OUTOFSTREAMS || - status == CHNL_E_BADCHANID || + status == -ECHRNG || status == -EALREADY || status == -EIO); status = -EPERM;