Replace CHNL_E_INVALIDWORDSIZE with EINVAL Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx> --- arch/arm/plat-omap/include/dspbridge/chnl.h | 2 +- arch/arm/plat-omap/include/dspbridge/io.h | 2 +- drivers/dsp/bridge/pmgr/chnl.c | 2 +- drivers/dsp/bridge/pmgr/io.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/include/dspbridge/chnl.h b/arch/arm/plat-omap/include/dspbridge/chnl.h index 98336a0..7c06869 100644 --- a/arch/arm/plat-omap/include/dspbridge/chnl.h +++ b/arch/arm/plat-omap/include/dspbridge/chnl.h @@ -66,7 +66,7 @@ extern dsp_status chnl_close(struct chnl_object *chnl_obj); * -EIO: Unable to plug channel ISR for configured IRQ. * CHNL_E_MAXCHANNELS: This manager cannot handle this many channels. * CHNL_E_INVALIDIRQ: Invalid IRQ number. Must be 0 <= birq <= 15. - * CHNL_E_INVALIDWORDSIZE: Invalid DSP word size. Must be > 0. + * -EINVAL: Invalid DSP word size. Must be > 0. * -EINVAL: Invalid base address for DSP communications. * -EEXIST: Channel manager already exists for this device. * Requires: diff --git a/arch/arm/plat-omap/include/dspbridge/io.h b/arch/arm/plat-omap/include/dspbridge/io.h index e491a50..752786f 100644 --- a/arch/arm/plat-omap/include/dspbridge/io.h +++ b/arch/arm/plat-omap/include/dspbridge/io.h @@ -42,7 +42,7 @@ * -ENOMEM: Insufficient memory for requested resources. * -EIO: Unable to plug channel ISR for configured IRQ. * CHNL_E_INVALIDIRQ: Invalid IRQ number. Must be 0 <= birq <= 15. - * CHNL_E_INVALIDWORDSIZE: Invalid DSP word size. Must be > 0. + * -EINVAL: Invalid DSP word size. Must be > 0. * -EINVAL: Invalid base address for DSP communications. * Requires: * io_init(void) called. diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c index 5bf1c66..50d49eb 100644 --- a/drivers/dsp/bridge/pmgr/chnl.c +++ b/drivers/dsp/bridge/pmgr/chnl.c @@ -76,7 +76,7 @@ dsp_status chnl_create(OUT struct chnl_mgr **phChnlMgr, status = CHNL_E_MAXCHANNELS; if (pMgrAttrs->word_size == 0) - status = CHNL_E_INVALIDWORDSIZE; + status = -EINVAL; if (DSP_SUCCEEDED(status)) { status = dev_get_chnl_mgr(hdev_obj, &hchnl_mgr); diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c index e544dee..de46cde 100644 --- a/drivers/dsp/bridge/pmgr/io.c +++ b/drivers/dsp/bridge/pmgr/io.c @@ -66,7 +66,7 @@ dsp_status io_create(OUT struct io_mgr **phIOMgr, struct dev_object *hdev_obj, status = -EINVAL; if (pMgrAttrs->word_size == 0) - status = CHNL_E_INVALIDWORDSIZE; + status = -EINVAL; if (DSP_SUCCEEDED(status)) { dev_get_intf_fxns(hdev_obj, &intf_fxns); -- 1.7.1 -- 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