From patchwork Thu Apr 15 21:17:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Shivananda" X-Patchwork-Id: 92846 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 o3FLHGo2012152 for ; Thu, 15 Apr 2010 21:17:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757216Ab0DOVR0 (ORCPT ); Thu, 15 Apr 2010 17:17:26 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:51948 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757215Ab0DOVRZ convert rfc822-to-8bit (ORCPT ); Thu, 15 Apr 2010 17:17:25 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3FLHMgp008698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 15 Apr 2010 16:17:24 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3FLHMYH011075 for ; Fri, 16 Apr 2010 02:47:22 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 16 Apr 2010 02:47:22 +0530 From: "Hebbar, Shivananda" To: "linux-omap@vger.kernel.org" CC: "Ramirez Luna, Omar" Date: Fri, 16 Apr 2010 02:47:20 +0530 Subject: [RFC] [PATCH 6/13] DSPBRIDGE: Cleanup custom error code (DSP_ESTRMMODE -> -EPERM) Thread-Topic: [RFC] [PATCH 6/13] DSPBRIDGE: Cleanup custom error code (DSP_ESTRMMODE -> -EPERM) Thread-Index: AcrYYTbP28t4VxCsRsePEzJQCtKq1QEc6xCg Message-ID: <19F8576C6E063C45BE387C64729E7394044E136FDD@dbde02.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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, 15 Apr 2010 21:17:27 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h index 46fa77e..06c6030 100644 --- a/arch/arm/plat-omap/include/dspbridge/errbase.h +++ b/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -168,9 +168,6 @@ /* Invalid segment ID */ #define DSP_EBADSEGID (DSP_EBASE + 0x38) -/* Invalid stream mode */ -#define DSP_ESTRMMODE (DSP_EBASE + 0x3a) - /* Not shared memory */ #define DSP_ENOTSHAREDMEM (DSP_EBASE + 0x3c) diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index 871cd13..7f35052 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -901,7 +901,7 @@ dsp_status node_connect(struct node_object *hNode1, u32 uStream1, */ if (DSP_SUCCEEDED(status) && pattrs) { if (pattrs->strm_mode != STRMMODE_PROCCOPY) - status = DSP_ESTRMMODE; /* illegal stream mode */ + status = -EPERM; /* illegal stream mode */ } if (DSP_FAILED(status))