summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:43:05 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:43:05 -0700
commit7de2c5b6ae9c99e7b4213c06ed5264c24d943a35 (patch)
treef546f54479c737d9ec5fd79fb3d3fae891c7f3db /drivers/staging
parent70128792b7802efcf485e9b62249cf8a639187d8 (diff)
downloadop-kernel-dev-7de2c5b6ae9c99e7b4213c06ed5264c24d943a35.zip
op-kernel-dev-7de2c5b6ae9c99e7b4213c06ed5264c24d943a35.tar.gz
staging: csr: remove CsrMemCalloc()
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/csr/csr_framework_ext.c29
-rw-r--r--drivers/staging/csr/csr_framework_ext.h23
2 files changed, 0 insertions, 52 deletions
diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c
index a34d263..771a369 100644
--- a/drivers/staging/csr/csr_framework_ext.c
+++ b/drivers/staging/csr/csr_framework_ext.c
@@ -149,35 +149,6 @@ 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
*
* DESCRIPTION
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h
index 141f288..817369d 100644
--- a/drivers/staging/csr/csr_framework_ext.h
+++ b/drivers/staging/csr/csr_framework_ext.h
@@ -244,27 +244,6 @@ 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
*
* DESCRIPTION
@@ -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
OpenPOWER on IntegriCloud