From patchwork Tue Feb 23 17:05:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 81492 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 o1NGvlZF020454 for ; Tue, 23 Feb 2010 16:57:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753355Ab0BWQ5r (ORCPT ); Tue, 23 Feb 2010 11:57:47 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:58376 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753130Ab0BWQ5q (ORCPT ); Tue, 23 Feb 2010 11:57:46 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1NGqcKf022657 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 23 Feb 2010 10:52:38 -0600 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 o1NGqbhi013725; Tue, 23 Feb 2010 10:52:38 -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 o1NGqbZ25740; Tue, 23 Feb 2010 10:52:37 -0600 (CST) Received: by Matrix (Postfix, from userid 1003) id A637C4105DF; Tue, 23 Feb 2010 11:05:43 -0600 (CST) From: Omar Ramirez Luna To: linux-omap Cc: Ameya Palande , Hiroshi Doyu , Felipe Contreras , Nishanth Menon , Omar Ramirez Luna Subject: [PATCH] DSPBRIDGE: Remove GT_TRACE conditional macro Date: Tue, 23 Feb 2010 11:05:43 -0600 Message-Id: <1266944743-989-1-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 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]); Tue, 23 Feb 2010 16:57:48 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/dbc.h b/arch/arm/plat-omap/include/dspbridge/dbc.h index c4bf803..4ed8f72 100644 --- a/arch/arm/plat-omap/include/dspbridge/dbc.h +++ b/arch/arm/plat-omap/include/dspbridge/dbc.h @@ -25,13 +25,7 @@ #ifndef DBC_ #define DBC_ -#ifndef GT_TRACE -#define GT_TRACE 0 /* 0 = "trace compiled out"; 1 = "trace active" */ -#endif - /* Assertion Macros: */ -#if GT_TRACE - #define DBC_Assert(exp) \ if (!(exp)) \ pr_err("%s, line %d: Assertion (" #exp ") failed.\n", \ @@ -39,12 +33,4 @@ #define DBC_Require DBC_Assert /* Function Precondition. */ #define DBC_Ensure DBC_Assert /* Function Postcondition. */ -#else - -#define DBC_Assert(exp) {} -#define DBC_Require(exp) {} -#define DBC_Ensure(exp) {} - -#endif /* DEBUG */ - #endif /* DBC_ */ diff --git a/drivers/dsp/bridge/Makefile b/drivers/dsp/bridge/Makefile index 11d92cd..11f48cb 100644 --- a/drivers/dsp/bridge/Makefile +++ b/drivers/dsp/bridge/Makefile @@ -20,11 +20,6 @@ libhw = hw/hw_prcm.o hw/hw_dspssC64P.o hw/hw_mmu.o hw/hw_mbox.o bridgedriver-objs = $(libgen) $(libservices) $(libwmd) $(libpmgr) $(librmgr) \ $(libdload) $(libhw) -# Debug -ifeq ($(CONFIG_BRIDGE_DEBUG),y) -ccflags-y += -DGT_TRACE -endif - #Machine dependent ccflags-y += -D_TI_ -D_DB_TIOMAP -DTMS32060 \ -DTICFG_PROC_VER -DTICFG_EVM_TYPE -DCHNL_SMCLASS \ diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index ecd5905..47ca742 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -513,9 +513,7 @@ DSP_STATUS DRV_GetDevObject(u32 uIndex, struct DRV_OBJECT *hDrvObject, struct DEV_OBJECT **phDevObject) { DSP_STATUS status = DSP_SOK; -#if GT_TRACE /* pDrvObject is used only for Assertions and debug messages.*/ struct DRV_OBJECT *pDrvObject = (struct DRV_OBJECT *)hDrvObject; -#endif struct DEV_OBJECT *pDevObject; u32 i; DBC_Require(MEM_IsValidHandle(pDrvObject, SIGNATURE)); diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 3d3f02d..fa97caa 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -533,9 +533,7 @@ err: /* This function maps kernel space memory to user space memory. */ static int bridge_mmap(struct file *filp, struct vm_area_struct *vma) { -#if GT_TRACE u32 offset = vma->vm_pgoff << PAGE_SHIFT; -#endif u32 status; DBC_Assert(vma->vm_start < vma->vm_end);