From b6d9e0cb142bdae60872a9be392ed8b6e5dde243 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Aug 2015 19:19:19 -0700 Subject: [PATCH] staging: wilc1000: remove WILC_MemoryFree It's no longer needed, so remove the empty wrapper function. Cc: Johnny Kim Cc: Rachel Kim Cc: Dean Lee Cc: Chris Park Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/wilc_memory.c | 13 ------------ drivers/staging/wilc1000/wilc_memory.h | 29 -------------------------- 2 files changed, 42 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_memory.c b/drivers/staging/wilc1000/wilc_memory.c index 53ba1d01632d..e90a95705a7d 100644 --- a/drivers/staging/wilc1000/wilc_memory.c +++ b/drivers/staging/wilc1000/wilc_memory.c @@ -14,16 +14,3 @@ void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, else return NULL; } - - - -/*! - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, - char *pcFileName, u32 u32LineNo) -{ - kfree(pvBlock); -} diff --git a/drivers/staging/wilc1000/wilc_memory.h b/drivers/staging/wilc1000/wilc_memory.h index 78b9d5828779..877617c5307f 100644 --- a/drivers/staging/wilc1000/wilc_memory.h +++ b/drivers/staging/wilc1000/wilc_memory.h @@ -47,27 +47,6 @@ typedef struct { void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, char *pcFileName, u32 u32LineNo); - - -/*! - * @brief Frees given block - * @param[in] pvBlock the memory block to be freed - * @param[in] strAttrs Optional attributes, NULL for default - * @param[in] pcFileName file name of the calling code for debugging - * @param[in] u32LineNo line number of the calling code for debugging - * @note It is recommended to use of of the wrapper macros instead of - * calling this function directly - * @sa sttrWILC_MemoryAttrs - * @sa WILC_FREE - * @sa WILC_FREE_EX - * @sa WILC_FREE_SET_NULL - * @author syounan - * @date 16 Aug 2010 - * @version 1.0 - */ -void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, - char *pcFileName, u32 u32LineNo); - /*! * @brief standrad malloc wrapper with custom attributes */ @@ -75,14 +54,6 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, (WILC_MemoryAlloc( \ (__size__), __attrs__, NULL, 0)) - -/*! - * @brief standrad free wrapper with custom attributes - */ - #define WILC_FREE_EX(__ptr__, __attrs__) \ - (WILC_MemoryFree( \ - (__ptr__), __attrs__, NULL, 0)) - /*! * @brief Allocates a block (with custom attributes) of given type and number of * elements -- 2.39.2