From patchwork Thu Mar 25 20:06: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: 88315 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 o2PK6N0r021275 for ; Thu, 25 Mar 2010 20:06:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754656Ab0CYUGW (ORCPT ); Thu, 25 Mar 2010 16:06:22 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:36980 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754378Ab0CYUGW convert rfc822-to-8bit (ORCPT ); Thu, 25 Mar 2010 16:06:22 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2PK6Epm005769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Mar 2010 15:06:16 -0500 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 o2PK6Dio027551; Fri, 26 Mar 2010 01:36:13 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Fri, 26 Mar 2010 01:36:13 +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:36:11 +0530 Subject: [RFC][PATCH 1/19] DSPBRIDGE: Cleanup custom error code (DSP_EALREADYCONNECTED ->EISCONN) Thread-Topic: [RFC][PATCH 1/19] DSPBRIDGE: Cleanup custom error code (DSP_EALREADYCONNECTED ->EISCONN) Thread-Index: AcrMVp2njAkFboQ6QWqljU0joMgn2Q== Message-ID: <19F8576C6E063C45BE387C64729E7394044DEBEB1D@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:06:23 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h index d43ff86..a2fa786 100644 --- a/arch/arm/plat-omap/include/dspbridge/errbase.h +++ b/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -69,9 +69,6 @@ /* The caller does not have access privileges to call this function */ #define DSP_EACCESSDENIED (DSP_EBASE + 0) -/* The Specified Connection already exists */ -#define DSP_EALREADYCONNECTED (DSP_EBASE + 1) - /* The GPP must be detached from the DSP before this function is called */ #define DSP_EATTACHED (DSP_EBASE + 2) diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index c18539d..9535dfc 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -933,7 +933,7 @@ dsp_status node_connect(struct node_object *hNode1, u32 uStream1, &(hNode1->create_args.asa. task_arg_obj.strm_out_def[uStream1]); if (output->sz_device != NULL) - status = DSP_EALREADYCONNECTED; + status = EISCONN; } if (node2_type == NODE_TASK || node2_type == NODE_DAISSOCKET) { @@ -941,7 +941,7 @@ dsp_status node_connect(struct node_object *hNode1, u32 uStream1, &(hNode2->create_args.asa. task_arg_obj.strm_in_def[uStream2]); if (input->sz_device != NULL) - status = DSP_EALREADYCONNECTED; + status = EISCONN; } }