From patchwork Thu Mar 25 20:07:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Shivananda" X-Patchwork-Id: 88331 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 o2PK6Q3i021290 for ; Thu, 25 Mar 2010 20:07:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747Ab0CYUHT (ORCPT ); Thu, 25 Mar 2010 16:07:19 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:42933 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754702Ab0CYUHS convert rfc822-to-8bit (ORCPT ); Thu, 25 Mar 2010 16:07:18 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2PK7CNK007949 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Mar 2010 15:07:14 -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 o2PK7BED027690; Fri, 26 Mar 2010 01:37:11 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 26 Mar 2010 01:37:11 +0530 From: "Hebbar, Shivananda" To: "linux-omap@vger.kernel.org" CC: "Ramirez Luna, Omar" , Felipe Contreras , "Menon, Nishanth" , "Palande Ameya (Nokia-D/Helsinki)" Date: Fri, 26 Mar 2010 01:37:09 +0530 Subject: [RFC][PATCH 18/19] DSPBRIDGE: Cleanup custom error code (CHNL_E_CANCELLED -> ECANCELED) Thread-Topic: [RFC][PATCH 18/19] DSPBRIDGE: Cleanup custom error code (CHNL_E_CANCELLED -> ECANCELED) Thread-Index: AcrMVsAb07bjeTd6QOajGp4Q94Yzgw== Message-ID: <19F8576C6E063C45BE387C64729E7394044DEBEB2E@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]); Thu, 25 Mar 2010 20:07:20 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h index 51e9407..3524a33 100644 --- a/arch/arm/plat-omap/include/dspbridge/errbase.h +++ b/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -300,9 +300,6 @@ * queued. */ #define CHNL_E_NOIOC (CHNL_EBASE + 0x06) -/* I/O has been cancelled on this channel. */ -#define CHNL_E_CANCELLED (CHNL_EBASE + 0x07) - /* End of stream was already requested on this output channel. */ #define CHNL_E_EOS (CHNL_EBASE + 0x09) diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h index d743063..7f339dd 100644 --- a/arch/arm/plat-omap/include/dspbridge/wmd.h +++ b/arch/arm/plat-omap/include/dspbridge/wmd.h @@ -453,7 +453,7 @@ typedef dsp_status(*fxn_chnl_close) (struct chnl_object *chnl_obj); * EFAULT: Invalid chnl_obj. * EFAULT: pHostBuf is invalid. * CHNL_E_NOEOS: User cannot mark EOS on an input channel. - * CHNL_E_CANCELLED: I/O has been cancelled on this channel. No further + * ECANCELED: I/O has been cancelled on this channel. No further * I/O is allowed. * CHNL_E_EOS: End of stream was already marked on a previous * IORequest on this channel. No further I/O is expected. diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index b926779..9c4dada 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -123,7 +123,7 @@ dsp_status bridge_chnl_add_io_req(struct chnl_object *chnl_obj, void *pHostBuf, dw_state = pchnl->dw_state; if (dw_state != CHNL_STATEREADY) { if (dw_state & CHNL_STATECANCEL) - status = CHNL_E_CANCELLED; + status = ECANCELED; else if ((dw_state & CHNL_STATEEOS) && CHNL_IS_OUTPUT(pchnl->chnl_mode)) status = CHNL_E_EOS;