From patchwork Thu Jun 3 05:47:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 103997 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 o535upip018587 for ; Thu, 3 Jun 2010 05:56:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932718Ab0FCF4t (ORCPT ); Thu, 3 Jun 2010 01:56:49 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:56437 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754138Ab0FCF4U (ORCPT ); Thu, 3 Jun 2010 01:56:20 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uGtV020754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 00:56:16 -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 o535uDYe027268; Thu, 3 Jun 2010 00:56:13 -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 o535uDP27866; Thu, 3 Jun 2010 00:56:13 -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 23/40] DSPBRIDGE: err code replace DSP_EOVERLAYMEMORY with ENXIO Date: Thu, 3 Jun 2010 00:47:36 -0500 Message-Id: <1275544073-20418-24-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:51 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h index b93671b..e5108b4 100644 --- a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h +++ b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h @@ -247,7 +247,7 @@ typedef bool(*nldr_initfxn) (void); * Returns: * 0: Success. * -ENOMEM: Insufficient memory on GPP. - * DSP_EOVERLAYMEMORY: Can't overlay phase because overlay memory + * -ENXIO: Can't overlay phase because overlay memory * is already in use. * -EILSEQ: Failure in dynamic loader library. * DSP_EFWRITE: Failed to write phase's code or date to target. diff --git a/arch/arm/plat-omap/include/dspbridge/rmm.h b/arch/arm/plat-omap/include/dspbridge/rmm.h index 42da289..8958a50 100644 --- a/arch/arm/plat-omap/include/dspbridge/rmm.h +++ b/arch/arm/plat-omap/include/dspbridge/rmm.h @@ -63,7 +63,7 @@ struct rmm_target_obj; * Returns: * 0: Success. * -ENOMEM: Memory allocation on GPP failed. - * DSP_EOVERLAYMEMORY: Cannot "allocate" overlay memory because it's + * -ENXIO: Cannot "allocate" overlay memory because it's * already in use. * Requires: * RMM initialized. diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c index 64d8c56..efefb65 100644 --- a/drivers/dsp/bridge/rmgr/rmm.c +++ b/drivers/dsp/bridge/rmgr/rmm.c @@ -130,7 +130,7 @@ dsp_status rmm_alloc(struct rmm_target_obj *target, u32 segid, u32 size, (prev_sect->addr + prev_sect->size > addr))) { - status = DSP_EOVERLAYMEMORY; + status = -ENXIO; } break; }