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:47:35 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 22:47:35 (GMT)
commit4becf12de1a4efefd28e057750e35f4ceb32dd1d (patch)
treea8f4cab8fd4699e12edc3482d367f1f315cd15fe /drivers/staging/csr/csr_framework_ext.h
parent7de2c5b6ae9c99e7b4213c06ed5264c24d943a35 (diff)
downloadlinux-fsl-qoriq-4becf12de1a4efefd28e057750e35f4ceb32dd1d.tar.xz
staging: csr: remove CsrMemAllocDma()
It's just a call to kmalloc(, GFP_KERNEL | GFP_DMA); But, all memory allocated by kmalloc can be DMAed, and that's not what GFP_DMA means, so remove that flag, and just call kmalloc(, GFP_KERNEL); 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.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h
index 817369d..66973e9 100644
--- a/drivers/staging/csr/csr_framework_ext.h
+++ b/drivers/staging/csr/csr_framework_ext.h
@@ -241,37 +241,6 @@ CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *thread
*----------------------------------------------------------------------------*/
void CsrThreadSleep(u16 sleepTimeInMs);
-#ifndef CSR_PMEM_DEBUG_ENABLE
-/*----------------------------------------------------------------------------*
- * NAME
- * CsrMemAllocDma
- *
- * DESCRIPTION
- * Allocate dynamic memory suitable for DMA transfers.
- *
- * RETURNS
- * Pointer to allocated memory, or NULL in case of failure.
- * Allocated memory is not initialised.
- *
- *----------------------------------------------------------------------------*/
-#ifdef CSR_MEM_DEBUG
-void *CsrMemAllocDmaDebug(size_t size,
- const char *file, u32 line);
-#define CsrMemAllocDma(sz) CsrMemAllocDmaDebug((sz), __FILE__, __LINE__)
-#else
-void *CsrMemAllocDma(size_t size);
-#endif
-
-
-#else
-
-#include "csr_pmem.h"
-
-#define CsrMemAllocDma(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA, __FILE__, __LINE__)
-
-#endif
-
-
#ifdef __cplusplus
}
#endif