diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 22:37:12 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 22:37:12 (GMT) |
| commit | 70128792b7802efcf485e9b62249cf8a639187d8 (patch) | |
| tree | 22453e906c9796628b84256944786db506450cf3 /drivers/staging/csr/csr_framework_ext.h | |
| parent | 4fe9db37104f833972486355fe86d7dcd29279b5 (diff) | |
| download | linux-fsl-qoriq-70128792b7802efcf485e9b62249cf8a639187d8.tar.xz | |
staging: csr: remove CsrMemAlloc()
It's just calling kmalloc(, GFP_KERNEL), so call that instead.
A few places should be calling kzalloc(), so do that, and remove the
call to memset at the same time.
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.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index a3fc152..141f288 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -244,26 +244,6 @@ void CsrThreadSleep(u16 sleepTimeInMs); #ifndef CSR_PMEM_DEBUG_ENABLE /*----------------------------------------------------------------------------* * NAME - * CsrMemAlloc - * - * DESCRIPTION - * Allocate dynamic memory of a given size. - * - * RETURNS - * Pointer to allocated memory, or NULL in case of failure. - * Allocated memory is not initialised. - * - *----------------------------------------------------------------------------*/ -#ifdef CSR_MEM_DEBUG -void *CsrMemAllocDebug(size_t size, - const char *file, u32 line); -#define CsrMemAlloc(sz) CsrMemAllocDebug((sz), __FILE__, __LINE__) -#else -void *CsrMemAlloc(size_t size); -#endif - -/*----------------------------------------------------------------------------* - * NAME * CsrMemCalloc * * DESCRIPTION @@ -308,8 +288,6 @@ void *CsrMemAllocDma(size_t size); #include "csr_pmem.h" -#define CsrMemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC, __FILE__, __LINE__) - #define CsrMemCalloc(numberOfElements, elementSize) CsrPmemDebugAlloc((numberOfElements * elementSize), CSR_PMEM_DEBUG_TYPE_MEM_CALLOC, __FILE__, __LINE__) #define CsrMemAllocDma(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA, __FILE__, __LINE__) |