From 7de2c5b6ae9c99e7b4213c06ed5264c24d943a35 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Jul 2012 15:43:05 -0700
Subject: [PATCH] staging: csr: remove CsrMemCalloc()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

No one calls it, so it doesn't need to be here.

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>
---
 drivers/staging/csr/csr_framework_ext.c | 29 -------------------------
 drivers/staging/csr/csr_framework_ext.h | 23 --------------------
 2 files changed, 52 deletions(-)

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
-- 
2.20.1