Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71b13e59 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove unused memory handling code 



The driver contains its own abstraction for memory allocation,
most of it unused. This removes the unused parts, but the
rest should also be removed later.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ed3dc1d

drivers/staging/wilc1000/wilc_memory.c

+0 −5
Original line number Diff line number Diff line 


#include "wilc_oswrapper.h"



#ifdef CONFIG_WILC_MEMORY_FEATURE





/*!

 *  @author	syounan

 *  @date	18 Aug 2010
@@ -59,5 +56,3 @@ void WILC_MemoryFree(void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, 
{

	kfree(pvBlock);

}
 


#endif

drivers/staging/wilc1000/wilc_memory.h

+0 −93
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
 *  @version	1.0

 */



#ifndef CONFIG_WILC_MEMORY_FEATURE

#error the feature CONFIG_WILC_MEMORY_FEATURE must be supported to include this file

#endif



/*!

 *  @struct             tstrWILC_MemoryAttrs

 *  @brief		Memory API options
@@ -22,32 +18,8 @@ 
 *  @version		1.0

 */

typedef struct {

	#ifdef CONFIG_WILC_MEMORY_POOLS

	/*!< the allocation pool to use for this memory, NULL for system

	 * allocation. Default is NULL

	 */

	WILC_MemoryPoolHandle *pAllocationPool;

	#endif



	/* a dummy member to avoid compiler errors*/

	WILC_Uint8 dummy;

} tstrWILC_MemoryAttrs;



/*!

 *  @brief	Fills the tstrWILC_MemoryAttrs with default parameters

 *  @param[out]	pstrAttrs structure to be filled

 *  @sa		tstrWILC_MemoryAttrs

 *  @author	syounan

 *  @date	16 Aug 2010

 *  @version	1.0

 */

static void WILC_MemoryFillDefault(tstrWILC_MemoryAttrs *pstrAttrs)

{

	#ifdef CONFIG_WILC_MEMORY_POOLS

	pstrAttrs->pAllocationPool = WILC_NULL;

	#endif

}



/*!

 *  @brief	Allocates a given size of bytes

 *  @param[in]	u32Size size of memory in bytes to be allocated
@@ -144,69 +116,6 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize, 
void WILC_MemoryFree(void *pvBlock, tstrWILC_MemoryAttrs *strAttrs,

			WILC_Char *pcFileName, WILC_Uint32 u32LineNo);



/*!

 *  @brief	Creates a new memory pool

 *  @param[out]	pHandle the handle to the new Pool

 *  @param[in]	u32PoolSize The pool size in bytes

 *  @param[in]	strAttrs Optional attributes, NULL for default

 *  @return	Error code indicating sucess/failure

 *  @sa		sttrWILC_MemoryAttrs

 *  @author	syounan

 *  @date	16 Aug 2010

 *  @version	1.0

 */

WILC_ErrNo WILC_MemoryNewPool(WILC_MemoryPoolHandle *pHandle, WILC_Uint32 u32PoolSize,

			      tstrWILC_MemoryAttrs *strAttrs);



/*!

 *  @brief	Deletes a memory pool, freeing all memory allocated from it as well

 *  @param[in]	pHandle the handle to the deleted Pool

 *  @param[in]	strAttrs Optional attributes, NULL for default

 *  @return	Error code indicating sucess/failure

 *  @sa		sttrWILC_MemoryAttrs

 *  @author	syounan

 *  @date	16 Aug 2010

 *  @version	1.0

 */

WILC_ErrNo WILC_MemoryDelPool(WILC_MemoryPoolHandle *pHandle, tstrWILC_MemoryAttrs *strAttrs);





#ifdef CONFIG_WILC_MEMORY_DEBUG



/*!

 * @brief	standrad malloc wrapper with custom attributes

 */

	#define WILC_MALLOC_EX(__size__, __attrs__) \

	(WILC_MemoryAlloc( \

		 (__size__), __attrs__,	\

		 (WILC_Char *)__WILC_FILE__, (WILC_Uint32)__WILC_LINE__))



/*!

 * @brief	standrad calloc wrapper with custom attributes

 */

	#define WILC_CALLOC_EX(__size__, __attrs__) \

	(WILC_MemoryCalloc( \

		 (__size__), __attrs__,	\

		 (WILC_Char *)__WILC_FILE__, (WILC_Uint32)__WILC_LINE__))



/*!

 * @brief	standrad realloc wrapper with custom attributes

 */

	#define WILC_REALLOC_EX(__ptr__, __new_size__, __attrs__) \

	(WILC_MemoryRealloc( \

		 (__ptr__), (__new_size__), __attrs__, \

		 (WILC_Char *)__WILC_FILE__, (WILC_Uint32)__WILC_LINE__))



/*!

 * @brief	standrad free wrapper with custom attributes

 */

	#define WILC_FREE_EX(__ptr__, __attrs__) \

	(WILC_MemoryFree( \

		 (__ptr__), __attrs__, \

		 (WILC_Char *)__WILC_FILE__, (WILC_Uint32)__WILC_LINE__))



#else



/*!

 * @brief	standrad malloc wrapper with custom attributes

 */
@@ -234,8 +143,6 @@ WILC_ErrNo WILC_MemoryDelPool(WILC_MemoryPoolHandle *pHandle, tstrWILC_MemoryAtt 
	(WILC_MemoryFree( \

		 (__ptr__), __attrs__, WILC_NULL, 0))



#endif



/*!

 * @brief	Allocates a block (with custom attributes) of given type and number of

 * elements

drivers/staging/wilc1000/wilc_osconfig.h

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#define CONFIG_WILC_SLEEP_HI_RES 1

#define CONFIG_WILC_TIMER_FEATURE 1

/* #define CONFIG_WILC_TIMER_PERIODIC 1 */

#define CONFIG_WILC_MEMORY_FEATURE 1

/* #define CONFIG_WILC_MEMORY_POOLS 1 */

/* #define CONFIG_WILC_MEMORY_DEBUG 1 */

/* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */

/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */

/* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */

drivers/staging/wilc1000/wilc_oswrapper.h

+0 −2
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ typedef WILC_Uint16 WILC_WideChar; 
#endif



/* Memory support */

#ifdef CONFIG_WILC_MEMORY_FEATURE

#include "wilc_memory.h"

#endif



/* String Utilities */

#include "wilc_strutils.h"

drivers/staging/wilc1000/wilc_platform.h

+0 −13
Original line number Diff line number Diff line
@@ -33,18 +33,6 @@ 


/* CONFIG_WILC_TIMER_PERIODIC is implemented */



/* CONFIG_WILC_MEMORY_FEATURE is implemented */



/* remove the following block when implementing its feature */

#ifdef CONFIG_WILC_MEMORY_POOLS

#error This feature is not supported by this OS

#endif



/* remove the following block when implementing its feature */

#ifdef CONFIG_WILC_MEMORY_DEBUG

#error This feature is not supported by this OS

#endif



/* remove the following block when implementing its feature */

#ifdef CONFIG_WILC_ASSERTION_SUPPORT

#error This feature is not supported by this OS
@@ -100,7 +88,6 @@ 
 *      OS specific types

 *******************************************************************/



typedef void *WILC_MemoryPoolHandle;

typedef struct semaphore WILC_SemaphoreHandle;



typedef struct timer_list WILC_TimerHandle;