From patchwork Thu Jun 3 05:47:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103974 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o535uHGV018360 for ; Thu, 3 Jun 2010 05:56:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932464Ab0FCF4S (ORCPT ); Thu, 3 Jun 2010 01:56:18 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:39714 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072Ab0FCF4Q (ORCPT ); Thu, 3 Jun 2010 01:56:16 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uEi3005061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:14 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o535uBQi004628; Thu, 3 Jun 2010 00:56:11 -0500 (CDT) Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o535uAP27814; Thu, 3 Jun 2010 00:56:10 -0500 (CDT) From: Omar Ramirez Luna To: linux-omap Cc: Omar Ramirez Luna , Shivananda Hebbar , Hiroshi DOYU , Fernando Guzman Lugo , Ivan Gomez Castellanos , Ernesto Ramos , Armando Uribe De Leon , Ameya Palande , Felipe Contreras Subject: [PATCH 10/40] DSPBRIDGE: err code replace CHNL_E_INVALIDMEMBASE with EINVAL Date: Thu, 3 Jun 2010 00:47:23 -0500 Message-Id: <1275544073-20418-11-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com> References: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 05:56:19 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/chnl.h b/arch/arm/plat-omap/include/dspbridge/chnl.h index 04856c2..98336a0 100644 --- a/arch/arm/plat-omap/include/dspbridge/chnl.h +++ b/arch/arm/plat-omap/include/dspbridge/chnl.h @@ -67,7 +67,7 @@ extern dsp_status chnl_close(struct chnl_object *chnl_obj); * 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. - * CHNL_E_INVALIDMEMBASE: Invalid base address for DSP communications. + * -EINVAL: Invalid base address for DSP communications. * -EEXIST: Channel manager already exists for this device. * Requires: * chnl_init(void) called. diff --git a/arch/arm/plat-omap/include/dspbridge/io.h b/arch/arm/plat-omap/include/dspbridge/io.h index f880b80..e491a50 100644 --- a/arch/arm/plat-omap/include/dspbridge/io.h +++ b/arch/arm/plat-omap/include/dspbridge/io.h @@ -43,7 +43,7 @@ * -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. - * CHNL_E_INVALIDMEMBASE: Invalid base address for DSP communications. + * -EINVAL: Invalid base address for DSP communications. * Requires: * io_init(void) called. * phIOMgr != NULL. diff --git a/drivers/dsp/bridge/core/io_sm.c b/drivers/dsp/bridge/core/io_sm.c index 79baa2c..72245d8 100644 --- a/drivers/dsp/bridge/core/io_sm.c +++ b/drivers/dsp/bridge/core/io_sm.c @@ -363,7 +363,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr) goto func_end; } if (ul_shm_limit <= ul_shm_base) { - status = CHNL_E_INVALIDMEMBASE; + status = -EINVAL; goto func_end; } /* Get total length in bytes */ @@ -382,7 +382,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr) &ul_msg_limit); if (DSP_SUCCEEDED(status)) { if (ul_msg_limit <= ul_msg_base) { - status = CHNL_E_INVALIDMEMBASE; + status = -EINVAL; } else { /* * Length (bytes) of messaging part of shared diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c index c0897c6..e544dee 100644 --- a/drivers/dsp/bridge/pmgr/io.c +++ b/drivers/dsp/bridge/pmgr/io.c @@ -63,7 +63,7 @@ dsp_status io_create(OUT struct io_mgr **phIOMgr, struct dev_object *hdev_obj, /* A memory base of 0 implies no memory base: */ if ((pMgrAttrs->shm_base != 0) && (pMgrAttrs->usm_length == 0)) - status = CHNL_E_INVALIDMEMBASE; + status = -EINVAL; if (pMgrAttrs->word_size == 0) status = CHNL_E_INVALIDWORDSIZE;