[RFC,v1,17/19] DSPBRIDGE: Cleanup custom error code (CHNL_E_CHANBUSY -> -EALREADY)

Commit Message

Hebbar, Shivananda March 27, 2010, 2:29 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 e564284..51e9407 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -293,9 +293,6 @@ 
 /* Channel ID is out of range. */
 #define CHNL_E_BADCHANID            (CHNL_EBASE + 0x03)
 
-/* Channel is already in use. */
-#define CHNL_E_CHANBUSY             (CHNL_EBASE + 0x04)
-
 /* Invalid channel mode argument. */
 #define CHNL_E_BADMODE              (CHNL_EBASE + 0x05)
 
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index 339acfd..e368bbc 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -394,7 +394,7 @@  typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr,
  *      -EINVAL:        Invalid number of IOReqs.
  *      CHNL_E_OUTOFSTREAMS:    No free channels available.
  *      CHNL_E_BADCHANID:       Channel ID is out of range.
- *      CHNL_E_CHANBUSY:        Channel is in use.
+ *      -EALREADY:        Channel is in use.
  *      CHNL_E_NOIORPS:         No free IO request packets available for
  *                              queuing.
  *  Requires:
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index b78360f..45a15b4 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -596,7 +596,7 @@  func_cont:
 				 */
 				DBC_ASSERT(status == CHNL_E_OUTOFSTREAMS ||
 					   status == CHNL_E_BADCHANID ||
-					   status == CHNL_E_CHANBUSY ||
+					   status == -EALREADY ||
 					   status == CHNL_E_NOIORPS);
 				status = DSP_EFAIL;
 			}
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c
index 63ffc34..d3e59d3 100644
--- a/drivers/dsp/bridge/wmd/chnl_sm.c
+++ b/drivers/dsp/bridge/wmd/chnl_sm.c
@@ -811,7 +811,7 @@  dsp_status bridge_chnl_open(OUT struct chnl_object **phChnl,
 					status = CHNL_E_BADCHANID;
 				else if (chnl_mgr_obj->ap_channel[uChnlId] !=
 					 NULL)
-					status = CHNL_E_CHANBUSY;
+					status = -EALREADY;
 			} else {
 				/* Check for free channel */
 				status =