>From 8efca5b26980b94ed9caa812fa702477d4b78fc2 Mon Sep 17 00:00:00 2001
From: Shivananda Hebbar <x0heb...@ti.com>
Date: Tue, 23 Mar 2010 09:10:22 -0600
Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (DSP_EALREADYCONNECTED
->EISCONN)
This patch replaces DSP_EALREADYCONNECTED with EISCONN.
Signed-off-by: Shivananda Hebbar <x0heb...@ti.com>
---
arch/arm/plat-omap/include/dspbridge/errbase.h | 3 ---
drivers/dsp/bridge/rmgr/node.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
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;
}
}
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
