[RFC,12/13] DSPBRIDGE: Cleanup custom error code (REG_E_NOMOREITEMS -> -ENODATA)

Commit Message

Hebbar, Shivananda April 15, 2010, 9:18 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 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);