>From a70cecfb7c889d75492241110a547bc4ef0b5ee4 Mon Sep 17 00:00:00 2001
From: Shivananda Hebbar <x0hebbar@xxxxxx>
Date: Fri, 9 Apr 2010 12:11:58 -0500
Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (REG_E_NOMOREITEMS -> -ENODATA)
This patch replaces REG_E_NOMOREITEMS with -ENODATA
Signed-off-by: Shivananda Hebbar <x0hebbar@xxxxxx>
---
arch/arm/plat-omap/include/dspbridge/errbase.h | 3 ---
drivers/dsp/bridge/rmgr/dbdcd.c | 2 +-
drivers/dsp/bridge/services/regsup.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 60f902c..0ae64fa 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -344,9 +344,6 @@
/* Invalid entry parameter. */
#define REG_E_INVALIDENTRY (REG_EBASE + 0x01)
-/* No more registry values. */
-#define REG_E_NOMOREITEMS (REG_EBASE + 0x02)
-
/* Insufficient space to hold data in registry value. */
#define REG_E_MOREDATA (REG_EBASE + 0x03)
diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c
index 21333fc..a80b726 100644
--- a/drivers/dsp/bridge/rmgr/dbdcd.c
+++ b/drivers/dsp/bridge/rmgr/dbdcd.c
@@ -281,7 +281,7 @@ dsp_status dcd_enumerate_object(IN s32 cIndex, IN enum dsp_dcdobjtype obj_type,
enum_refs++;
status = DSP_SOK;
- } else if (status == REG_E_NOMOREITEMS) {
+ } else if (status == -ENODATA) {
/* At the end of enumeration. Reset enum_refs. */
enum_refs = 0;
diff --git a/drivers/dsp/bridge/services/regsup.c b/drivers/dsp/bridge/services/regsup.c
index eca9bb2..d69960b 100644
--- a/drivers/dsp/bridge/services/regsup.c
+++ b/drivers/dsp/bridge/services/regsup.c
@@ -201,7 +201,7 @@ dsp_status regsup_enum_value(IN u32 dw_index, IN CONST char *pstrKey,
}
if (count && DSP_FAILED(ret))
- ret = REG_E_NOMOREITEMS;
+ ret = -ENODATA;
dev_dbg(bridge, "REG: enum Key %s, Value %s, status = 0x%x",
pstrKey, pstrValue, ret);
--
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
