[RFC,v1,1/19] DSPBRIDGE: Cleanup custom error code(DSP_EALREADYCONNECTED ->-EISCONN)

Commit Message

Hebbar, Shivananda March 27, 2010, 2:26 a.m. UTC

None

Patch

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;
 
 		}
 	}