[RFC,v1,19/19] DSPBRIDGE: Cleanup custom error code (WMD_E_TIMEOUT -> -ETIMEDOUT)

Commit Message

Hebbar, Shivananda March 27, 2010, 2:30 a.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 3524a33..a9ecb71 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -370,9 +370,6 @@ 
 /* One or more configuration parameters violated WMD hardware assumptions. */
 #define WMD_E_BADCONFIG             (WMD_EBASE + 0x01)
 
-/* Timeout occurred waiting for a response from the hardware. */
-#define WMD_E_TIMEOUT               (WMD_EBASE + 0x02)
-
 /* FAILURE Codes : REG */
 #define REG_EBASE                   (DSP_COMP_EBASE + 0x800)
 
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index 856a737..540b568 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -59,7 +59,7 @@  struct wmd_dev_context;
  *  Returns:
  *      DSP_SOK:        Success.
  *      WMD_E_HARDWARE: A test of hardware assumptions/integrity failed.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL
@@ -98,7 +98,7 @@  typedef dsp_status(*fxn_brd_setstate) (struct wmd_dev_context
  *      dwDSPAddr:      DSP address at which to start execution.
  *  Returns:
  *      DSP_SOK:        Success.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL
@@ -149,7 +149,7 @@  typedef dsp_status(*fxn_brd_memcopy) (struct wmd_dev_context
  *      ulMemType:      Memory space on DSP to which to transfer.
  *  Returns:
  *      DSP_SOK:        Success.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL;
@@ -211,7 +211,7 @@  typedef dsp_status(*fxn_brd_memunmap) (struct wmd_dev_context
  *      hDevContext:    Handle to mini-driver defined device context.
  *  Returns:
  *      DSP_SOK:        Success.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL
@@ -253,7 +253,7 @@  typedef dsp_status(*fxn_brd_status) (struct wmd_dev_context *hDevContext,
  *      ulMemType:      Memory space on DSP from which to transfer.
  *  Returns:
  *      DSP_SOK:        Success.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL;
@@ -279,7 +279,7 @@  typedef dsp_status(*fxn_brd_read) (struct wmd_dev_context *hDevContext,
  *      ulMemType:      Memory space on DSP to which to transfer.
  *  Returns:
  *      DSP_SOK:        Success.
- *      WMD_E_TIMEOUT:  Timeout occured waiting for a response from hardware.
+ *      -ETIMEDOUT:  Timeout occured waiting for a response from hardware.
  *      DSP_EFAIL:      Other, unspecified error.
  *  Requires:
  *      hDevContext != NULL;
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index b06b11d..16ce28d 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -722,7 +722,7 @@  static dsp_status bridge_brd_start(struct wmd_dev_context *hDevContext,
 		/* Wait for DSP to clear word in shared memory */
 		/* Read the Location */
 		if (!wait_for_start(dev_context, dw_sync_addr))
-			status = WMD_E_TIMEOUT;
+			status = -ETIMEDOUT;
 
 		status = dev_get_io_mgr(dev_context->hdev_obj, &hio_mgr);
 		if (DSP_SUCCEEDED(status)) {
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index 17f4e7d..6c4911d 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -115,7 +115,7 @@  dsp_status handle_hibernation_from_dsp(struct wmd_dev_context *dev_context)
 	}
 	if (timeout == 0) {
 		pr_err("%s: Timed out waiting for DSP off mode\n", __func__);
-		status = WMD_E_TIMEOUT;
+		status = -ETIMEDOUT;
 		return status;
 	} else {
 
@@ -231,7 +231,7 @@  dsp_status sleep_dsp(struct wmd_dev_context *dev_context, IN u32 dw_cmd,
 		dev_get_deh_mgr(dev_context->hdev_obj, &hdeh_mgr);
 		bridge_deh_notify(hdeh_mgr, DSP_PWRERROR, 0);
 #endif /* CONFIG_BRIDGE_NTFY_PWRERR */
-		return WMD_E_TIMEOUT;
+		return -ETIMEDOUT;
 	} else {
 		/* Update the Bridger Driver state */
 		if (dsp_test_sleepstate == HW_PWR_STATE_OFF)