diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c index a34d2632ae22..771a3692f670 100644 --- a/drivers/staging/csr/csr_framework_ext.c +++ b/drivers/staging/csr/csr_framework_ext.c @@ -147,35 +147,6 @@ void CsrThreadSleep(u16 sleepTimeInMs) } EXPORT_SYMBOL_GPL(CsrThreadSleep); -/*----------------------------------------------------------------------------* - * NAME - * CsrMemCalloc - * - * DESCRIPTION - * Allocate dynamic memory of a given size calculated as the - * numberOfElements times the elementSize. - * - * RETURNS - * Pointer to allocated memory, or NULL in case of failure. - * Allocated memory is zero initialised. - * - *----------------------------------------------------------------------------*/ -void *CsrMemCalloc(size_t numberOfElements, size_t elementSize) -{ - void *buf; - size_t size; - - size = numberOfElements * elementSize; - - buf = kmalloc(size, GFP_KERNEL); - if (buf != NULL) - { - memset(buf, 0, size); - } - - return buf; -} - /*----------------------------------------------------------------------------* * NAME * CsrMemAllocDma diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index 141f2884688f..817369da1f97 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -242,27 +242,6 @@ CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *thread void CsrThreadSleep(u16 sleepTimeInMs); #ifndef CSR_PMEM_DEBUG_ENABLE -/*----------------------------------------------------------------------------* - * NAME - * CsrMemCalloc - * - * DESCRIPTION - * Allocate dynamic memory of a given size calculated as the - * numberOfElements times the elementSize. - * - * RETURNS - * Pointer to allocated memory, or NULL in case of failure. - * Allocated memory is zero initialised. - * - *----------------------------------------------------------------------------*/ -#ifdef CSR_MEM_DEBUG -void *CsrMemCallocDebug(size_t numberOfElements, size_t elementSize, - const char *file, u32 line); -#define CsrMemCalloc(cnt, sz) CsrMemAllocDebug((cnt), (sz), __FILE__, __LINE__) -#else -void *CsrMemCalloc(size_t numberOfElements, size_t elementSize); -#endif - /*----------------------------------------------------------------------------* * NAME * CsrMemAllocDma @@ -288,8 +267,6 @@ void *CsrMemAllocDma(size_t size); #include "csr_pmem.h" -#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__) #endif