>From 67e5343bec9a3f262a02b65fa92c98a1170100f2 Mon Sep 17 00:00:00 2001
From: Shivananda Hebbar <x0hebbar@xxxxxx>
Date: Wed, 24 Mar 2010 12:47:45 -0600
Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (DSP_EUUID -> -ENOKEY)
This patch replaces DSP_EUUID with -ENOKEY.
Signed-off-by: Shivananda Hebbar <x0hebbar@xxxxxx>
---
arch/arm/plat-omap/include/dspbridge/errbase.h | 3 ---
arch/arm/plat-omap/include/dspbridge/node.h | 2 +-
drivers/dsp/bridge/rmgr/dbdcd.c | 2 +-
3 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 dedca5d..7e2f0b6 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -122,9 +122,6 @@
* found in the COFF file. */
#define DSP_ESYMBOL (DSP_EBASE + 0x1c)
-/* UUID not found in registry. */
-#define DSP_EUUID (DSP_EBASE + 0x1d)
-
/* Unable to read content of DCD data section ; this is typically caused by
* improperly configured nodes. */
#define DSP_EDCDREADSECT (DSP_EBASE + 0x1e)
diff --git a/arch/arm/plat-omap/include/dspbridge/node.h b/arch/arm/plat-omap/include/dspbridge/node.h
index 00affd0..073991b 100644
--- a/arch/arm/plat-omap/include/dspbridge/node.h
+++ b/arch/arm/plat-omap/include/dspbridge/node.h
@@ -40,7 +40,7 @@
* Returns:
* DSP_SOK: Success.
* -ENOMEM: Insufficient memory on GPP.
- * DSP_EUUID: Node UUID has not been registered.
+ * -ENOKEY: Node UUID has not been registered.
* DSP_ESYMBOL: iAlg functions not found for a DAIS node.
* -EDOM: attr_in != NULL and attr_in->prio out of
* range.
diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c
index f3a2ebf..21333fc 100644
--- a/drivers/dsp/bridge/rmgr/dbdcd.c
+++ b/drivers/dsp/bridge/rmgr/dbdcd.c
@@ -441,7 +441,7 @@ dsp_status dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
reg_get_value(sz_reg_key, (u8 *) sz_reg_data, &dw_buf_size);
if (DSP_FAILED(status)) {
- status = DSP_EUUID;
+ status = -ENOKEY;
goto func_end;
}
--
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
