[RFC,2/13] DSPBRIDGE: Cleanup custom error code (DSP_ESTREAMFULL -> -ENOSR)

Commit Message

Hebbar, Shivananda April 15, 2010, 9:17 p.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 8a0e48c..28c4d7b 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -79,11 +79,6 @@ 
 /* A failure occurred during a delete operation */
 #define DSP_EDELETE                 (DSP_EBASE + 5)
 
-/* A stream has been issued the maximum number of buffers allowed in the
- * stream at once ;  buffers must be reclaimed from the stream before any
- * more can be issued. */
-#define DSP_ESTREAMFULL             (DSP_EBASE + 7)
-
 /* A general failure occurred */
 #define DSP_EFAIL                   (DSP_EBASE + 8)
 
diff --git a/arch/arm/plat-omap/include/dspbridge/strm.h b/arch/arm/plat-omap/include/dspbridge/strm.h
index fd27da2..8770608 100644
--- a/arch/arm/plat-omap/include/dspbridge/strm.h
+++ b/arch/arm/plat-omap/include/dspbridge/strm.h
@@ -234,7 +234,7 @@  extern bool strm_init(void);
  *  Returns:
  *      DSP_SOK:            Success.
  *      -EFAULT:        Invalid hStrm.
- *      DSP_ESTREAMFULL:    The stream is full.
+ *      -ENOSR:    The stream is full.
  *      DSP_EFAIL:          Failure occurred, unable to issue buffer.
  *  Requires:
  *      strm_init(void) called.
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index 10d86ca..5102422 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -459,7 +459,7 @@  dsp_status strm_issue(struct strm_object *hStrm, IN u8 *pbuf, u32 ul_bytes,
 			     (u32) tmp_buf, dw_arg);
 		}
 		if (status == CHNL_E_NOIORPS)
-			status = DSP_ESTREAMFULL;
+			status = -ENOSR;
 	}
 
 	dev_dbg(bridge, "%s: hStrm: %p pbuf: %p ul_bytes: 0x%x dw_arg: 0x%x "