summaryrefslogtreecommitdiff
path: root/drivers/staging/csr/csr_framework_ext.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 22:26:55 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 22:26:55 (GMT)
commit4fe9db37104f833972486355fe86d7dcd29279b5 (patch)
treea946ecfff6f0f4eef92bd4a457a7f567d37f4526 /drivers/staging/csr/csr_framework_ext.h
parentd63123fc5084d5e38074ad8fb3f08a39747bcea6 (diff)
downloadlinux-fsl-qoriq-4fe9db37104f833972486355fe86d7dcd29279b5.tar.xz
staging: csr: remove CsrMemFree() and CsrMemFreeDma()
They were just wrappers around kfree() so call that instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_framework_ext.h')
-rw-r--r--drivers/staging/csr/csr_framework_ext.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h
index 46689c1..a3fc152 100644
--- a/drivers/staging/csr/csr_framework_ext.h
+++ b/drivers/staging/csr/csr_framework_ext.h
@@ -285,19 +285,6 @@ void *CsrMemCalloc(size_t numberOfElements, size_t elementSize);
/*----------------------------------------------------------------------------*
* NAME
- * CsrMemFree
- *
- * DESCRIPTION
- * Free dynamic allocated memory.
- *
- * RETURNS
- * void
- *
- *----------------------------------------------------------------------------*/
-void CsrMemFree(void *pointer);
-
-/*----------------------------------------------------------------------------*
- * NAME
* CsrMemAllocDma
*
* DESCRIPTION
@@ -317,18 +304,6 @@ void *CsrMemAllocDma(size_t size);
#endif
-/*----------------------------------------------------------------------------*
- * NAME
- * CsrMemFreeDma
- *
- * DESCRIPTION
- * Free dynamic memory allocated by CsrMemAllocDma.
- *
- * RETURNS
- * void
- *
- *----------------------------------------------------------------------------*/
-void CsrMemFreeDma(void *pointer);
#else
#include "csr_pmem.h"
@@ -337,12 +312,8 @@ void CsrMemFreeDma(void *pointer);
#define CsrMemCalloc(numberOfElements, elementSize) CsrPmemDebugAlloc((numberOfElements * elementSize), CSR_PMEM_DEBUG_TYPE_MEM_CALLOC, __FILE__, __LINE__)
-#define CsrMemFree(ptr) CsrPmemDebugFree(ptr,CSR_PMEM_DEBUG_TYPE_MEM_ALLOC, __FILE__, __LINE__)
-
#define CsrMemAllocDma(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA, __FILE__, __LINE__)
-#define CsrMemFreeDma(ptr) CsrPmemDebugFree(ptr, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA, __FILE__, __LINE__)
-
#endif