From patchwork Thu Jun 3 05:47:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103975 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 o535uLlr018376 for ; Thu, 3 Jun 2010 05:56:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754092Ab0FCF4T (ORCPT ); Thu, 3 Jun 2010 01:56:19 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:44863 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753187Ab0FCF4Q (ORCPT ); Thu, 3 Jun 2010 01:56:16 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uEFQ003195 (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 dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o535uB4U027252; 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 o535uBP27818; Thu, 3 Jun 2010 00:56:11 -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 11/40] DSPBRIDGE: err code replace CHNL_E_INVALIDWORDSIZE with EINVAL Date: Thu, 3 Jun 2010 00:47:24 -0500 Message-Id: <1275544073-20418-12-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:22 +0000 (UTC) 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);