From patchwork Thu Feb 18 21:37:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 80446 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 o1ILPeN0004772 for ; Thu, 18 Feb 2010 21:25:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758041Ab0BRVZd (ORCPT ); Thu, 18 Feb 2010 16:25:33 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:54598 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755239Ab0BRVZ2 (ORCPT ); Thu, 18 Feb 2010 16:25:28 -0500 Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1ILPO9B029302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 18 Feb 2010 15:25:24 -0600 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 o1ILPNg5028954; Thu, 18 Feb 2010 15:25:23 -0600 (CST) Received: from Matrix (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o1ILPNZ20000; Thu, 18 Feb 2010 15:25:23 -0600 (CST) Received: by Matrix (Postfix, from userid 1003) id 518F241060E; Thu, 18 Feb 2010 15:38:04 -0600 (CST) From: Omar Ramirez Luna To: linux-omap Cc: Ameya Palande , Hiroshi Doyu , Felipe Contreras , Nishanth Menon , Omar Ramirez Luna Subject: [PATCH 06/12] DSPBRIDGE: Remove GT_trace variables for rmgr Date: Thu, 18 Feb 2010 15:37:57 -0600 Message-Id: <1266529083-2358-7-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1266529083-2358-6-git-send-email-omar.ramirez@ti.com> References: <1266529083-2358-1-git-send-email-omar.ramirez@ti.com> <1266529083-2358-2-git-send-email-omar.ramirez@ti.com> <1266529083-2358-3-git-send-email-omar.ramirez@ti.com> <1266529083-2358-4-git-send-email-omar.ramirez@ti.com> <1266529083-2358-5-git-send-email-omar.ramirez@ti.com> <1266529083-2358-6-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, 18 Feb 2010 21:25:41 +0000 (UTC) diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c index 067f7a0..9fd05a0 100644 --- a/drivers/dsp/bridge/rmgr/dbdcd.c +++ b/drivers/dsp/bridge/rmgr/dbdcd.c @@ -67,8 +67,6 @@ struct DCD_MANAGER { static u32 cRefs; static u32 cEnumRefs; -extern struct GT_Mask curTrace; - /* Helper function prototypes. */ static s32 Atoi(char *pszBuf); static DSP_STATUS GetAttrsFromBuf(char *pszBuf, u32 ulBufSize, diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c index 8c05593..6ae3bcb 100644 --- a/drivers/dsp/bridge/rmgr/disp.c +++ b/drivers/dsp/bridge/rmgr/disp.c @@ -81,11 +81,6 @@ struct DISP_OBJECT { static u32 cRefs; -/* Debug msgs: */ -#if GT_TRACE -static struct GT_Mask DISP_DebugMask = { NULL, NULL }; -#endif - static void DeleteDisp(struct DISP_OBJECT *hDisp); static DSP_STATUS FillStreamDef(RMS_WORD *pdwBuf, u32 *ptotal, u32 offset, struct NODE_STRMDEF strmDef, u32 max, @@ -219,11 +214,6 @@ bool DISP_Init(void) DBC_Require(cRefs >= 0); - if (cRefs == 0) { - DBC_Assert(!DISP_DebugMask.flags); - GT_create(&DISP_DebugMask, "DI"); /* "DI" for DIspatcher */ - } - if (fRetVal) cRefs++; diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index f3e2632..177d676 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -66,10 +66,6 @@ struct DRV_EXT { /* ----------------------------------- Globals */ static s32 cRefs; -#if GT_TRACE -extern struct GT_Mask curTrace; -#endif - /* ----------------------------------- Function Prototypes */ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 fRequest); static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 fRequest); diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 4045784..24246d5 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -149,10 +149,6 @@ MODULE_VERSION(DSPBRIDGE_VERSION); static char *driver_name = DRIVER_NAME; -#ifdef CONFIG_BRIDGE_DEBUG -static struct GT_Mask driverTrace; -#endif /* CONFIG_BRIDGE_DEBUG */ - static struct file_operations bridge_fops = { .open = bridge_open, .release = bridge_release, @@ -261,7 +257,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) NULL, "DspBridge"); GT_init(); - GT_create(&driverTrace, "LD"); #ifdef CONFIG_BRIDGE_DEBUG if (GT_str) diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c index 59c2ecb..0fdb150 100644 --- a/drivers/dsp/bridge/rmgr/dspdrv.c +++ b/drivers/dsp/bridge/rmgr/dspdrv.c @@ -44,9 +44,6 @@ /* ----------------------------------- This */ #include -/* ----------------------------------- Globals */ -struct GT_Mask curTrace; - /* * ======== DSP_Init ======== * Allocates bridge resources. Loads a base image onto DSP, if specified. @@ -59,8 +56,6 @@ u32 DSP_Init(OUT u32 *initStatus) u32 deviceNode; u32 deviceNodeString; - GT_create(&curTrace, "DD"); - if (!WCD_Init()) goto func_cont; diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c index 73d7a66..e63aaa1 100644 --- a/drivers/dsp/bridge/rmgr/mgr.c +++ b/drivers/dsp/bridge/rmgr/mgr.c @@ -50,10 +50,6 @@ struct MGR_OBJECT { }; /* ----------------------------------- Globals */ -#if GT_TRACE -static struct GT_Mask MGR_DebugMask = { NULL, NULL }; -#endif - static u32 cRefs; /* @@ -355,11 +351,6 @@ bool MGR_Init(void) DBC_Require(cRefs >= 0); if (cRefs == 0) { - - /* Set the Trace mask */ - DBC_Assert(!MGR_DebugMask.flags); - - GT_create(&MGR_DebugMask, "MG"); /* "MG" for Manager */ fInitDCD = DCD_Init(); /* DCD Module */ if (!fInitDCD) diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c index fb5a788..5c1266d 100644 --- a/drivers/dsp/bridge/rmgr/nldr.c +++ b/drivers/dsp/bridge/rmgr/nldr.c @@ -292,7 +292,6 @@ static struct DBLL_Fxns dbllFxns = { (DBLL_UnloadSectFxn) DBLL_unloadSect, }; -static struct GT_Mask NLDR_debugMask = { NULL, NULL }; /* GT trace variable */ static u32 cRefs; /* module reference count */ static DSP_STATUS AddOvlyInfo(void *handle, struct DBLL_SectInfo *sectInfo, @@ -679,10 +678,8 @@ void NLDR_Exit(void) cRefs--; - if (cRefs == 0) { + if (cRefs == 0) RMM_exit(); - NLDR_debugMask.flags = NULL; - } DBC_Ensure(cRefs >= 0); } @@ -801,12 +798,8 @@ bool NLDR_Init(void) { DBC_Require(cRefs >= 0); - if (cRefs == 0) { - DBC_Assert(!NLDR_debugMask.flags); - GT_create(&NLDR_debugMask, "NL"); /* "NL" for NLdr */ - + if (cRefs == 0) RMM_init(); - } cRefs++; diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index 48a7728..cb3d324 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -266,10 +266,6 @@ static u32 Ovly(void *pPrivRef, u32 ulDspRunAddr, u32 ulDspLoadAddr, static u32 Write(void *pPrivRef, u32 ulDspAddr, void *pBuf, u32 ulNumBytes, u32 nMemSpace); -#if GT_TRACE -static struct GT_Mask NODE_debugMask = { NULL, NULL }; /* GT trace variable */ -#endif - #ifdef DSP_DMM_DEBUG extern u32 DMM_MemMapDump(struct DMM_OBJECT *hDmmMgr); #endif @@ -1930,11 +1926,6 @@ bool NODE_Init(void) { DBC_Require(cRefs >= 0); - if (cRefs == 0) { - DBC_Assert(!NODE_debugMask.flags); - GT_create(&NODE_debugMask, "NO"); /* "NO" for NOde */ - } - cRefs++; return true; diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index d8137c8..8489cd3 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -72,9 +72,6 @@ extern char *iva_img; /* ----------------------------------- Globals */ -#if GT_TRACE -static struct GT_Mask PROC_DebugMask = { NULL, NULL }; /* WCD MGR Mask */ -#endif /* The PROC_OBJECT structure. */ struct PROC_OBJECT { @@ -785,13 +782,8 @@ bool PROC_Init(void) DBC_Require(cRefs >= 0); - if (cRefs == 0) { - /* Set the Trace mask */ - DBC_Assert(!PROC_DebugMask.flags); - GT_create(&PROC_DebugMask, "PR"); /* "PR" for Processor */ - + if (cRefs == 0) (void)SYNC_InitializeCS(&hProcLock); - } if (fRetval) cRefs++; diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c index 8cf66ce..188faba 100644 --- a/drivers/dsp/bridge/rmgr/rmm.c +++ b/drivers/dsp/bridge/rmgr/rmm.c @@ -87,10 +87,6 @@ struct RMM_TargetObj { struct LST_LIST *ovlyList; /* List of overlay memory in use */ }; -#if GT_TRACE -static struct GT_Mask RMM_debugMask = { NULL, NULL }; /* GT trace variable */ -#endif - static u32 cRefs; /* module reference count */ static bool allocBlock(struct RMM_TargetObj *target, u32 segid, u32 size, @@ -367,12 +363,6 @@ bool RMM_init(void) { DBC_Require(cRefs >= 0); - if (cRefs == 0) { - DBC_Assert(!RMM_debugMask.flags); - GT_create(&RMM_debugMask, "RM"); /* "RM" for RMm */ - - } - cRefs++; return true; diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index 909a2b1..6b62e41 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -91,9 +91,6 @@ struct STRM_MGR { } ; /* ----------------------------------- Globals */ -#if GT_TRACE -static struct GT_Mask STRM_debugMask = { NULL, NULL }; /* GT trace variable */ -#endif static u32 cRefs; /* module reference count */ /* ----------------------------------- Function Prototypes */ @@ -412,13 +409,6 @@ bool STRM_Init(void) DBC_Require(cRefs >= 0); - if (cRefs == 0) { -#if GT_TRACE - DBC_Assert(!STRM_debugMask.flags); - GT_create(&STRM_debugMask, "ST"); /* "ST" for STrm */ -#endif - } - if (fRetVal) cRefs++;