>From beb1254acdd2d91aef4624f72783f298cb5187cd Mon Sep 17 00:00:00 2001
From: Shivananda Hebbar <x0hebbar@xxxxxx>
Date: Fri, 9 Apr 2010 11:39:04 -0500
Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (COD_E_OPENFAILED -> -EBADF)
This patch replaces COD_E_OPENFAILED with -EBADF.
Signed-off-by: Shivananda Hebbar <x0hebbar@xxxxxx>
---
arch/arm/plat-omap/include/dspbridge/cod.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/errbase.h | 3 ---
drivers/dsp/bridge/rmgr/proc.c | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/cod.h b/arch/arm/plat-omap/include/dspbridge/cod.h
index 381291c..f9d0aef 100644
--- a/arch/arm/plat-omap/include/dspbridge/cod.h
+++ b/arch/arm/plat-omap/include/dspbridge/cod.h
@@ -286,7 +286,7 @@ extern bool cod_init(void);
* envp: array of environment strings for DSP exec.
* Returns:
* DSP_SOK: Success.
- * COD_E_OPENFAILED: Failed to open target code.
+ * -EBADF: Failed to open target code.
* COD_E_LOADFAILED: Failed to load code onto target.
* Requires:
* COD module initialized.
@@ -315,7 +315,7 @@ extern dsp_status cod_load_base(struct cod_manager *cod_mgr_obj,
* and cod_get_section.
* Returns:
* S_OK: Success.
- * COD_E_OPENFAILED: Failed to open target code.
+ * -EBADF: Failed to open target code.
* Requires:
* COD module initialized.
* hmgr is valid.
@@ -337,7 +337,7 @@ extern dsp_status cod_open(struct cod_manager *hmgr,
* flags: Specifies whether to load symbols.
* Returns:
* DSP_SOK: Success.
- * COD_E_OPENFAILED: Failed to open target code.
+ * -EBADF: Failed to open target code.
* Requires:
* COD module initialized.
* hmgr is valid.
diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h
index dec4b34..679bb59 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -240,9 +240,6 @@
/* Unable to initialize the ZL COFF parsing module. */
#define COD_E_ZLCREATEFAILED (COD_EBASE + 0x03)
-/* Unable to open DSP executable COFF file. */
-#define COD_E_OPENFAILED (COD_EBASE + 0x04)
-
/* Unable to parse DSP executable COFF file. */
#define COD_E_LOADFAILED (COD_EBASE + 0x05)
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index bdd11a1..1199053 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -966,7 +966,7 @@ dsp_status proc_load(void *hprocessor, IN CONST s32 argc_index,
dev_brd_write_fxn,
p_proc_object->hdev_obj, NULL);
if (DSP_FAILED(status)) {
- if (status == COD_E_OPENFAILED) {
+ if (status == -EBADF) {
dev_dbg(bridge, "%s: Failure to Load the EXE\n",
__func__);
}
--
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
