---

yaml --- r: 318182 b: refs/heads/master c: 7de2c5b h: refs/heads/master v: v3
git-mirror · Jul 20, 2012 · 10be047 · 10be047
1 parent ab4a713
commit 10be047
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 53 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70128792b7802efcf485e9b62249cf8a639187d8
+refs/heads/master: 7de2c5b6ae9c99e7b4213c06ed5264c24d943a35
diff --git a/trunk/drivers/staging/csr/csr_framework_ext.c b/trunk/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/trunk/drivers/staging/csr/csr_framework_ext.h b/trunk/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