From patchwork Thu Jun 3 05:47:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103977 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 o535uMck018388 for ; Thu, 3 Jun 2010 05:56:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932569Ab0FCF4W (ORCPT ); Thu, 3 Jun 2010 01:56:22 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:37594 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753712Ab0FCF4Q (ORCPT ); Thu, 3 Jun 2010 01:56:16 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uDwg031682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:13 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o535uAaO009378; Thu, 3 Jun 2010 00:56:10 -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 o535uAP27802; 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 07/40] DSPBRIDGE: err code replace CHNL_E_ISR with EIO Date: Thu, 3 Jun 2010 00:47:20 -0500 Message-Id: <1275544073-20418-8-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:26 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/chnl.h b/arch/arm/plat-omap/include/dspbridge/chnl.h index 8761fcf..b97cced 100644 --- a/arch/arm/plat-omap/include/dspbridge/chnl.h +++ b/arch/arm/plat-omap/include/dspbridge/chnl.h @@ -63,7 +63,7 @@ extern dsp_status chnl_close(struct chnl_object *chnl_obj); * -EFAULT: hdev_obj is invalid. * -EINVAL: max_channels is 0. * -ENOMEM: Insufficient memory for requested resources. - * CHNL_E_ISR: Unable to plug channel ISR for configured IRQ. + * -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. diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h index ff352ce..f56fdca 100644 --- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h +++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h @@ -309,7 +309,7 @@ typedef dsp_status(*fxn_brd_write) (struct bridge_dev_context *hDevContext, * Returns: * 0: Success; * -ENOMEM: Insufficient memory for requested resources. - * CHNL_E_ISR: Unable to plug ISR for given IRQ. + * -EIO: Unable to plug ISR for given IRQ. * CHNL_E_NOMEMMAP: Couldn't map physical address to a virtual one. * Requires: * phChnlMgr != NULL. diff --git a/arch/arm/plat-omap/include/dspbridge/io.h b/arch/arm/plat-omap/include/dspbridge/io.h index 197628f..f880b80 100644 --- a/arch/arm/plat-omap/include/dspbridge/io.h +++ b/arch/arm/plat-omap/include/dspbridge/io.h @@ -40,7 +40,7 @@ * Returns: * 0: Success; * -ENOMEM: Insufficient memory for requested resources. - * CHNL_E_ISR: Unable to plug channel ISR for configured IRQ. + * -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. diff --git a/drivers/dsp/bridge/core/io_sm.c b/drivers/dsp/bridge/core/io_sm.c index 7246c22..5902d8a 100644 --- a/drivers/dsp/bridge/core/io_sm.c +++ b/drivers/dsp/bridge/core/io_sm.c @@ -236,7 +236,7 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr, if (dsp_wdt_init()) status = -EPERM; } else { - status = CHNL_E_ISR; + status = -EIO; } func_end: if (DSP_FAILED(status)) {