[RFC,9/13] DSPBRIDGE: Cleanup custom error code (CFG_E_RESOURCENOTAVAIL -> -NODATA)

Commit Message

Hebbar, Shivananda April 15, 2010, 9:17 p.m. UTC

None

Patch

diff --git a/arch/arm/plat-omap/include/dspbridge/cfg.h b/arch/arm/plat-omap/include/dspbridge/cfg.h
index 635ffbc..3eb47f5 100644
--- a/arch/arm/plat-omap/include/dspbridge/cfg.h
+++ b/arch/arm/plat-omap/include/dspbridge/cfg.h
@@ -44,7 +44,7 @@  extern void cfg_exit(void);
  *  Returns:
  *      DSP_SOK:                Success.
  *      -EFAULT:  dev_node_obj is invalid.
- *      CFG_E_RESOURCENOTAVAIL: Unable to retreive resource.
+ *      -ENODATA: Unable to retreive resource.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
@@ -84,7 +84,7 @@  extern dsp_status cfg_get_cd_version(OUT u32 *pdwVersion);
  *      DSP_SOK:                Success.
  *      -EFAULT:  dev_node_obj is invalid.
  *      -EFAULT:   phDevObject is invalid.
- *      CFG_E_RESOURCENOTAVAIL: The resource is not available.
+ *      -ENODATA: The resource is not available.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
@@ -104,7 +104,7 @@  extern dsp_status cfg_get_dev_object(IN struct cfg_devnode *dev_node_obj,
  *  Returns:
  *      DSP_SOK:                On success.
  *      -EFAULT:  dev_node_obj is invalid.
- *      CFG_E_RESOURCENOTAVAIL: The DSP Resource information is not
+ *      -ENODATA: The DSP Resource information is not
  *                              available
  *  Requires:
  *      CFG initialized.
@@ -127,7 +127,7 @@  extern dsp_status cfg_get_dsp_resources(IN struct cfg_devnode *dev_node_obj,
  *      DSP_SOK:                Success.
  *      -EFAULT:  dev_node_obj is invalid.
  *      -EFAULT:   pstrExecFile is invalid.
- *      CFG_E_RESOURCENOTAVAIL: The resource is not available.
+ *      -ENODATA: The resource is not available.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
@@ -149,7 +149,7 @@  extern dsp_status cfg_get_exec_file(IN struct cfg_devnode *dev_node_obj,
  *      DSP_SOK:                On success.
  *      -EFAULT:   pHostResTable is invalid.
  *      -EFAULT:  dev_node_obj is invalid.
- *      CFG_E_RESOURCENOTAVAIL: The resource is not available.
+ *      -ENODATA: The resource is not available.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
@@ -204,7 +204,7 @@  extern void cfg_get_perf_value(OUT bool *pfEnablePerf);
  *  Returns:
  *      DSP_SOK:                On success.
  *      -EFAULT:  dev_node_obj is invalid.
- *      CFG_E_RESOURCENOTAVAIL: The filename is not available.
+ *      -ENODATA: The filename is not available.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
@@ -228,7 +228,7 @@  extern dsp_status cfg_get_wmd_file_name(IN struct cfg_devnode *dev_node_obj,
  *      DSP_SOK:                Success.
  *      -EFAULT:   pstrZLFileName is invalid.
  *      -EFAULT:  dev_node_obj is invalid.
- *      CFG_E_RESOURCENOTAVAIL: couldn't find the ZLFileName.
+ *      -ENODATA: couldn't find the ZLFileName.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h
index 1c3da08..dec4b34 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -216,9 +216,6 @@ 
 /* FAILURE Codes : CFG */
 #define CFG_EBASE                   (DSP_COMP_EBASE + 0x200)
 
-/* Unable to retrieve resource information from the registry. */
-#define CFG_E_RESOURCENOTAVAIL      (CFG_EBASE + 0x02)
-
 /* Unable to find board name key in registry. */
 #define CFG_E_INVALIDBOARDNAME      (CFG_EBASE + 0x03)
 
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index 747ae0e..952dc25 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -65,7 +65,7 @@  dsp_status cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
 		status = reg_get_value(AUTOSTART, (u8 *) pdwAutoStart,
 				       &dw_buf_size);
 		if (DSP_FAILED(status))
-			status = CFG_E_RESOURCENOTAVAIL;
+			status = -ENODATA;
 	}
 
 	DBC_ENSURE((status == DSP_SOK &&
@@ -128,7 +128,7 @@  dsp_status cfg_get_dsp_resources(struct cfg_devnode *dev_node_obj,
 				       &dw_res_size);
 	}
 	if (DSP_FAILED(status)) {
-		status = CFG_E_RESOURCENOTAVAIL;
+		status = -ENODATA;
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
 	}
 	/* assert that resource values are reasonable */
@@ -160,7 +160,7 @@  dsp_status cfg_get_exec_file(struct cfg_devnode *dev_node_obj, u32 ul_buf_size,
 		status =
 		    reg_get_value(DEFEXEC, (u8 *) pstrExecFile, &exec_size);
 		if (DSP_FAILED(status))
-			status = CFG_E_RESOURCENOTAVAIL;
+			status = -ENODATA;
 		else if (exec_size > ul_buf_size)
 			status = -EINVAL;
 
@@ -195,7 +195,7 @@  dsp_status cfg_get_host_resources(struct cfg_devnode *dev_node_obj,
 		if (DSP_FAILED
 		    (reg_get_value
 		     (CURRENTCONFIG, (u8 *) pHostResTable, &dw_buf_size))) {
-			status = CFG_E_RESOURCENOTAVAIL;
+			status = -ENODATA;
 		}
 	}
 	if (DSP_FAILED(status))
@@ -220,13 +220,13 @@  dsp_status cfg_get_object(OUT u32 *pdwValue, u8 dw_type)
 		status =
 		    reg_get_value(DRVOBJECT, (u8 *) pdwValue, &dw_buf_size);
 		if (DSP_FAILED(status))
-			status = CFG_E_RESOURCENOTAVAIL;
+			status = -ENODATA;
 		break;
 	case (REG_MGR_OBJECT):
 		status =
 		    reg_get_value(MGROBJECT, (u8 *) pdwValue, &dw_buf_size);
 		if (DSP_FAILED(status))
-			status = CFG_E_RESOURCENOTAVAIL;
+			status = -ENODATA;
 		break;
 	default:
 		break;