From patchwork Thu Jun 3 05:47:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 104006 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 o535v1Ah018658 for ; Thu, 3 Jun 2010 05:57:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932699Ab0FCF5B (ORCPT ); Thu, 3 Jun 2010 01:57:01 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:39715 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932299Ab0FCF4R (ORCPT ); Thu, 3 Jun 2010 01:56:17 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uDpI005055 (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 dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o535uAap027247; 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 o535uAP27806; 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 08/40] DSPBRIDGE: err code replace CHNL_E_MGREXISTS with EEXIST Date: Thu, 3 Jun 2010 00:47:21 -0500 Message-Id: <1275544073-20418-9-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:57:04 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/chnl.h b/arch/arm/plat-omap/include/dspbridge/chnl.h index b97cced..04856c2 100644 --- a/arch/arm/plat-omap/include/dspbridge/chnl.h +++ b/arch/arm/plat-omap/include/dspbridge/chnl.h @@ -68,7 +68,7 @@ extern dsp_status chnl_close(struct chnl_object *chnl_obj); * 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. - * CHNL_E_MGREXISTS: Channel manager already exists for this device. + * -EEXIST: Channel manager already exists for this device. * Requires: * chnl_init(void) called. * phChnlMgr != NULL. diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c index 1c9cc5e..5bf1c66 100644 --- a/drivers/dsp/bridge/pmgr/chnl.c +++ b/drivers/dsp/bridge/pmgr/chnl.c @@ -81,7 +81,7 @@ dsp_status chnl_create(OUT struct chnl_mgr **phChnlMgr, if (DSP_SUCCEEDED(status)) { status = dev_get_chnl_mgr(hdev_obj, &hchnl_mgr); if (DSP_SUCCEEDED(status) && hchnl_mgr != NULL) - status = CHNL_E_MGREXISTS; + status = -EEXIST; }