From patchwork Thu Feb 4 15:33:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ameya Palande X-Patchwork-Id: 77050 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 o14FXuV2024241 for ; Thu, 4 Feb 2010 15:33:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932655Ab0BDPdz (ORCPT ); Thu, 4 Feb 2010 10:33:55 -0500 Received: from smtp.nokia.com ([192.100.122.233]:34522 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932278Ab0BDPdy (ORCPT ); Thu, 4 Feb 2010 10:33:54 -0500 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o14FXhl6026671; Thu, 4 Feb 2010 17:33:48 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 4 Feb 2010 17:33:40 +0200 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 4 Feb 2010 17:33:40 +0200 Received: from localhost.localdomain (esdhcp04335.research.nokia.com [172.21.43.35]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o14FXY3r019384; Thu, 4 Feb 2010 17:33:38 +0200 From: Ameya Palande To: linux-omap@vger.kernel.org Cc: omar.ramirez@ti.com, nm@ti.com, deepak.chitriki@ti.com Subject: [PATCH 3/3] DSPBRIDGE: Get rid of MEM_VFree() Date: Thu, 4 Feb 2010 17:33:14 +0200 Message-Id: X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <6320ca5c5c578ead8f092d0fe163bc319d0820d6.1265296743.git.ameya.palande@nokia.com> References: <5fd56ce70a150d5ff6711689dca84d932e4c9eca.1265296743.git.ameya.palande@nokia.com> <6320ca5c5c578ead8f092d0fe163bc319d0820d6.1265296743.git.ameya.palande@nokia.com> In-Reply-To: References: X-OriginalArrivalTime: 04 Feb 2010 15:33:40.0467 (UTC) FILETIME=[6D466430:01CAA5AF] X-Nokia-AV: Clean 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, 04 Feb 2010 15:33:57 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/mem.h b/arch/arm/plat-omap/include/dspbridge/mem.h index e20d6d2..9d9a7a3 100644 --- a/arch/arm/plat-omap/include/dspbridge/mem.h +++ b/arch/arm/plat-omap/include/dspbridge/mem.h @@ -140,23 +140,6 @@ extern void MEM_FlushCache(void *pMemBuf, u32 cBytes, s32 FlushType); /* - * ======== MEM_VFree ======== - * Purpose: - * Free the given block of system memory in virtual space. - * Parameters: - * pMemBuf: Pointer to memory allocated by MEM_Calloc/Alloc() - * using vmalloc. - * Returns: - * Requires: - * MEM initialized. - * pMemBuf is a valid memory address returned by MEM_Calloc/Alloc() - * using vmalloc. - * Ensures: - * pMemBuf is no longer a valid pointer to memory. - */ - extern void MEM_VFree(IN void *pMemBuf); - -/* * ======== MEM_FreePhysMem ======== * Purpose: * Free the given block of physically contiguous memory. diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c index d5a7275..2425f0f 100644 --- a/drivers/dsp/bridge/pmgr/dmm.c +++ b/drivers/dsp/bridge/pmgr/dmm.c @@ -220,8 +220,7 @@ DSP_STATUS DMM_DeleteTables(struct DMM_OBJECT *hDmmMgr) /* Delete all DMM tables */ SYNC_EnterCS(pDmmObj->hDmmLock); - if (pVirtualMappingTable != NULL) - MEM_VFree(pVirtualMappingTable); + vfree(pVirtualMappingTable); SYNC_LeaveCS(pDmmObj->hDmmLock); } else diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 614396e..57f1794 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -292,23 +292,6 @@ void MEM_FlushCache(void *pMemBuf, u32 cBytes, s32 FlushType) } /* - * ======== MEM_VFree ======== - * Purpose: - * Free the given block of system memory in virtual space. - */ -void MEM_VFree(IN void *pMemBuf) -{ - DBC_Require(pMemBuf != NULL); - - GT_1trace(MEM_debugMask, GT_ENTER, "MEM_VFree: pMemBufs 0x%x\n", - pMemBuf); - - if (pMemBuf) { - vfree(pMemBuf); - } -} - -/* * ======== MEM_FreePhysMem ======== * Purpose: * Free the given block of physically contiguous memory.