From patchwork Thu Jun 3 05:47:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103973 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 o535uHGU018360 for ; Thu, 3 Jun 2010 05:56:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753654Ab0FCF4Q (ORCPT ); Thu, 3 Jun 2010 01:56:16 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:44859 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034Ab0FCF4P (ORCPT ); Thu, 3 Jun 2010 01:56:15 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uDJD003192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:13 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o535uAm8027243; Thu, 3 Jun 2010 00:56:10 -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 o535uAP27798; Thu, 3 Jun 2010 00:56:10 -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 06/40] DSPBRIDGE: err code replace CHNL_E_NOIORPS with EIO Date: Thu, 3 Jun 2010 00:47:19 -0500 Message-Id: <1275544073-20418-7-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:18 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h index 3d53881..ff352ce 100644 --- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h +++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h @@ -395,7 +395,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr, * CHNL_E_OUTOFSTREAMS: No free channels available. * CHNL_E_BADCHANID: Channel ID is out of range. * -EALREADY: Channel is in use. - * CHNL_E_NOIORPS: No free IO request packets available for + * -EIO: No free IO request packets available for * queuing. * Requires: * phChnl != NULL. diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c index 3cebf94..449b897 100644 --- a/drivers/dsp/bridge/core/chnl_sm.c +++ b/drivers/dsp/bridge/core/chnl_sm.c @@ -185,7 +185,7 @@ func_cont: chnl_packet_obj = (struct chnl_irp *)lst_get_head(pchnl->free_packets_list); if (chnl_packet_obj == NULL) - status = CHNL_E_NOIORPS; + status = -EIO; } if (DSP_SUCCEEDED(status)) { diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index 7e2481f..accfb7b 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -448,7 +448,7 @@ dsp_status strm_issue(struct strm_object *hStrm, IN u8 *pbuf, u32 ul_bytes, (hStrm->chnl_obj, pbuf, ul_bytes, ul_buf_size, (u32) tmp_buf, dw_arg); } - if (status == CHNL_E_NOIORPS) + if (status == -EIO) status = -ENOSR; } @@ -587,7 +587,7 @@ func_cont: DBC_ASSERT(status == CHNL_E_OUTOFSTREAMS || status == CHNL_E_BADCHANID || status == -EALREADY || - status == CHNL_E_NOIORPS); + status == -EIO); status = -EPERM; } }