From patchwork Sat Mar 27 02:26:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Shivananda" X-Patchwork-Id: 88651 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 o2R2R2Wb014480 for ; Sat, 27 Mar 2010 02:27:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580Ab0C0C1G (ORCPT ); Fri, 26 Mar 2010 22:27:06 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:39500 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752533Ab0C0C1D convert rfc822-to-8bit (ORCPT ); Fri, 26 Mar 2010 22:27:03 -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 o2R2R0ma006197 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 26 Mar 2010 21:27:03 -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 o2R2R0L1026473 for ; Sat, 27 Mar 2010 07:57:00 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Sat, 27 Mar 2010 07:57:00 +0530 From: "Hebbar, Shivananda" To: "linux-omap@vger.kernel.org" Date: Sat, 27 Mar 2010 07:56:58 +0530 Subject: [RFC][PATCH v1 1/19] DSPBRIDGE: Cleanup custom error code(DSP_EALREADYCONNECTED ->-EISCONN) Thread-Topic: [RFC][PATCH v1 1/19] DSPBRIDGE: Cleanup custom error code(DSP_EALREADYCONNECTED ->-EISCONN) Thread-Index: AcrNVPmc1/arIEj4SOqmnrBtg3Tveg== Message-ID: <19F8576C6E063C45BE387C64729E7394044DEBEE07@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:27:07 +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..86035a1 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; } }