>From 0e3d9c1ccc09389155202da25b856698195fb556 Mon Sep 17 00:00:00 2001 From: Shivananda Hebbar <x0hebbar@xxxxxx> Date: Thu, 8 Apr 2010 17:34:59 -0500 Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (DSP_ESTREAMFULL -> -ENOSR) This patch replaces DSP_ESTREAMFULL with -ENOSR. Signed-off-by: Shivananda Hebbar <x0hebbar@xxxxxx> --- arch/arm/plat-omap/include/dspbridge/errbase.h | 5 ----- arch/arm/plat-omap/include/dspbridge/strm.h | 2 +- drivers/dsp/bridge/rmgr/strm.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) 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 " -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
