>From 3f0617e4cb1b60150617090399eecb08a9116e44 Mon Sep 17 00:00:00 2001 From: Shivananda Hebbar <x0hebbar@xxxxxx> Date: Wed, 24 Mar 2010 11:31:43 -0600 Subject: [PATCH] DSPBRIDGE: Cleanup custom error code (DSP_ERANGE -> -EDOM) This patch replaces DSP_ERANGE with -EDOM. Signed-off-by: Shivananda Hebbar <x0hebbar@xxxxxx> --- arch/arm/plat-omap/include/dspbridge/errbase.h | 3 --- arch/arm/plat-omap/include/dspbridge/node.h | 4 ++-- arch/arm/plat-omap/include/dspbridge/strm.h | 2 +- drivers/dsp/bridge/rmgr/node.c | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h index da2900c..1cc0101 100644 --- a/arch/arm/plat-omap/include/dspbridge/errbase.h +++ b/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -99,9 +99,6 @@ /* I/O is currently pending. */ #define DSP_EPENDING (DSP_EBASE + 0x11) -/* A parameter is specified outside its valid range. */ -#define DSP_ERANGE (DSP_EBASE + 0x13) - /* An invalid size parameter was specified. */ #define DSP_ESIZE (DSP_EBASE + 0x14) diff --git a/arch/arm/plat-omap/include/dspbridge/node.h b/arch/arm/plat-omap/include/dspbridge/node.h index 3bf8a03..814065f 100644 --- a/arch/arm/plat-omap/include/dspbridge/node.h +++ b/arch/arm/plat-omap/include/dspbridge/node.h @@ -42,7 +42,7 @@ * -ENOMEM: Insufficient memory on GPP. * DSP_EUUID: Node UUID has not been registered. * DSP_ESYMBOL: iAlg functions not found for a DAIS node. - * DSP_ERANGE: attr_in != NULL and attr_in->prio out of + * -EDOM: attr_in != NULL and attr_in->prio out of * range. * DSP_EFAIL: A failure occured, unable to allocate node. * DSP_EWRONGSTATE: Proccessor is not in the running state. @@ -99,7 +99,7 @@ extern dsp_status node_alloc_msg_buf(struct node_object *hnode, * Returns: * DSP_SOK: Success. * -EFAULT: Invalid hnode. - * DSP_ERANGE: prio is out of range. + * -EDOM: prio is out of range. * -EPERM: The specified node is not a task node. * DSP_EWRONGSTATE: Node is not in the NODE_ALLOCATED, NODE_PAUSED, * or NODE_RUNNING state. diff --git a/arch/arm/plat-omap/include/dspbridge/strm.h b/arch/arm/plat-omap/include/dspbridge/strm.h index c2a5ed7..73902a8 100644 --- a/arch/arm/plat-omap/include/dspbridge/strm.h +++ b/arch/arm/plat-omap/include/dspbridge/strm.h @@ -363,7 +363,7 @@ extern dsp_status strm_register_notify(struct strm_object *hStrm, * utimeout: Timeout value (milliseconds). * Returns: * DSP_SOK: Success. - * DSP_ERANGE: nStrms out of range. + * -EDOM: nStrms out of range. * -EFAULT: Invalid stream handle in array. * DSP_ETIMEOUT: A timeout occurred before a stream became ready. diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index f242580..9fa7569 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -374,7 +374,7 @@ dsp_status node_allocate(struct proc_object *hprocessor, /* Check if attr_in->prio is within range */ if (attr_in->prio < hnode_mgr->min_pri || attr_in->prio > hnode_mgr->max_pri) - status = DSP_ERANGE; + status = -EDOM; } } /* Allocate node object and fill in */ @@ -785,7 +785,7 @@ dsp_status node_change_priority(struct node_object *hnode, s32 prio) if (node_type != NODE_TASK && node_type != NODE_DAISSOCKET) status = -EPERM; else if (prio < hnode_mgr->min_pri || prio > hnode_mgr->max_pri) - status = DSP_ERANGE; + status = -EDOM; } if (DSP_FAILED(status)) goto func_end; -- 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