From patchwork Thu Jun 3 05:47:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103988 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 o535uXaL018466 for ; Thu, 3 Jun 2010 05:56:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932626Ab0FCF4h (ORCPT ); Thu, 3 Jun 2010 01:56:37 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:44888 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932555Ab0FCF4W (ORCPT ); Thu, 3 Jun 2010 01:56:22 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uI9H003225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:18 -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 o535uFFS009411; Thu, 3 Jun 2010 00:56:15 -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 o535uFP27906; Thu, 3 Jun 2010 00:56:15 -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 32/40] DSPBRIDGE: err code replace DSP_ESYMBOL with ESPIPE Date: Thu, 3 Jun 2010 00:47:45 -0500 Message-Id: <1275544073-20418-33-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:40 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h index e5108b4..9ab99d3 100644 --- a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h +++ b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h @@ -214,7 +214,7 @@ typedef void (*nldr_freefxn) (struct nldr_nodeobject *nldr_node_obj); * pulAddr: Location to store function address. * Returns: * 0: Success. - * DSP_ESYMBOL: Address of function not found. + * -ESPIPE: Address of function not found. * Requires: * nldr_init(void) called. * Valid nldr_node_obj. diff --git a/arch/arm/plat-omap/include/dspbridge/node.h b/arch/arm/plat-omap/include/dspbridge/node.h index bcfc65c..2f76c04 100644 --- a/arch/arm/plat-omap/include/dspbridge/node.h +++ b/arch/arm/plat-omap/include/dspbridge/node.h @@ -41,7 +41,7 @@ * 0: Success. * -ENOMEM: Insufficient memory on GPP. * -ENOKEY: Node UUID has not been registered. - * DSP_ESYMBOL: iAlg functions not found for a DAIS node. + * -ESPIPE: iAlg functions not found for a DAIS node. * -EDOM: attr_in != NULL and attr_in->prio out of * range. * -EPERM: A failure occured, unable to allocate node. @@ -199,7 +199,7 @@ extern dsp_status node_connect(struct node_object *hNode1, * Returns: * 0: Success. * -EFAULT: Invalid hnode. - * DSP_ESYMBOL: Create function not found in the COFF file. + * -ESPIPE: Create function not found in the COFF file. * DSP_EWRONGSTATE: Node is not in the NODE_ALLOCATED state. * -ENOMEM: Memory allocation failure on the DSP. * DSP_ETASK: Unable to create node's task or process on the DSP. @@ -255,7 +255,7 @@ extern dsp_status node_create_mgr(OUT struct node_mgr **phNodeMgr, * DSP_EDELETE: A deletion failure occurred. * DSP_EUSER1-16: Node specific failure occurred on the DSP. * -EPERM: A failure occurred in deleting the node. - * DSP_ESYMBOL: Delete function not found in the COFF file. + * -ESPIPE: Delete function not found in the COFF file. * Requires: * node_init(void) called. * Ensures: @@ -522,7 +522,7 @@ extern dsp_status node_register_notify(struct node_object *hnode, * -ETIME: A timeout occurred before the DSP responded. * DSP_EWRONGSTSATE: Node is not in NODE_PAUSED or NODE_CREATED state. * -EPERM: Unable to start or resume execution. - * DSP_ESYMBOL: Execute function not found in the COFF file. + * -ESPIPE: Execute function not found in the COFF file. * Requires: * node_init(void) called. * Ensures: diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c index d2cd465..f5b7239 100644 --- a/drivers/dsp/bridge/rmgr/nldr.c +++ b/drivers/dsp/bridge/rmgr/nldr.c @@ -764,7 +764,7 @@ dsp_status nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, if (status1) *pulAddr = dbll_sym->value; else - status = DSP_ESYMBOL; + status = -ESPIPE; return status; } @@ -1992,7 +1992,7 @@ dsp_status nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, if (!status1) { pr_debug("%s: Address 0x%x not found in range %d.\n", __func__, sym_addr, offset_range); - status = DSP_ESYMBOL; + status = -ESPIPE; } return status;