From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969AbbFATI7 (ORCPT ); Mon, 1 Jun 2015 15:08:59 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:61307 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753601AbbFATIb (ORCPT ); Mon, 1 Jun 2015 15:08:31 -0400 From: Arnd Bergmann To: Greg KH Cc: Rachel Kim , Dean Lee , Chris Park , devel@driverdev.osuosl.org, nicolas.ferre@atmel.com, Johnny Kim , linux-kernel@vger.kernel.org, Sudip Mukherjee , Arnd Bergmann Subject: [PATCH v2 04/12] staging: wilc1000: remove unused memory handling code Date: Mon, 1 Jun 2015 21:06:37 +0200 Message-Id: <1433185605-2492600-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1433185605-2492600-1-git-send-email-arnd@arndb.de> References: <1433185605-2492600-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:9vaEQi0quAPLYQSoyk5aGBPBJVULO54oNzuEbtWyoUDf58C+z8t 1/apA/JnJMcpDnR8KnWJ1caVTBiS6Ky+i4aTaVn/79MQAZdcvvrXSTXwD8BY+LPM+WimrZU CHRB0Tr+8Oxc5Xa76oqlgn8fLPI+9C0GxiOjLucLP1b5QOxI1tYbBjmQwRYlk3macNxrMcW nOIF1GPEalIk3wTSmMsvA== X-UI-Out-Filterresults: notjunk:1;V01:K0:lOx9txNKgOk=:xDOe82RmJg/zKITdoHrP0L pXCebG9cw8O+hyy1/vKgN2trNT4U+z4Cnx4cwsYLOpYCHqPSnHCmVYk4FlWRe6Vidikk+7E1+ 65fuvGGTlm8m5Yq8JoQnHE1iz+0rOvOHZEol5JOli6tqS+OmZY3htlZUnR+qMC+vOGe4oFMCD IqrAmobbfdcvOVcQvcZN5oHoWLmDMgMYSmbsdnhn2/8Xc072B9ZaHMEc+a7wJfRlTkeIHMsMq ZZ36StztcZxnMfAn1cf+k/IGxouikpuSyvM8CI+iZehJEakm3d0ESzoK1XUDEYf8g5Qrice9b t6QPJVAH+9kndZ4FxgUEkNlp3ZGUO3xSlDo+K4jp3TiRvK85o8Ld50zT7Tpy4LBY/UywdccnI vbUeDSaaVVGuOD7ZmfeLSYroCkPusKm9DZBam9MYYHj9cF7aIvfsysTIsof5zU4QtVfGqKn6c qz7Qt2GE9X/dENyp9PuF9jDpzGg+zOUCm81pj2JpCwqusTqaP5WFkAjasK5OSiE0p6J5UqSL6 U898RqxFXxt5fn8yDlRUPqtCP+BFPrFpIOhG4PHkJ261trjjW6Ih9l2fJeFqBlEoAvB+LBbbY lWfBfINbJktTmchDFfLrMfdAA3x5a1+36Np1/uiio0E+E5yODUil8vZun0+sFTdZrN+9tM5aq 2e1K2s7fIZnHCxoqMnhOXUU5E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Arnd Bergmann --- drivers/staging/wilc1000/wilc_memory.c | 5 -- drivers/staging/wilc1000/wilc_memory.h | 93 ------------------------------- drivers/staging/wilc1000/wilc_osconfig.h | 3 - drivers/staging/wilc1000/wilc_oswrapper.h | 2 - drivers/staging/wilc1000/wilc_platform.h | 13 ----- 5 files changed, 116 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_memory.c b/drivers/staging/wilc1000/wilc_memory.c index cf0976b443b8..fbba38da19bc 100644 --- a/drivers/staging/wilc1000/wilc_memory.c +++ b/drivers/staging/wilc1000/wilc_memory.c @@ -1,9 +1,6 @@ #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 diff --git a/drivers/staging/wilc1000/wilc_memory.h b/drivers/staging/wilc1000/wilc_memory.h index 1e45641af454..012f03cae0c8 100644 --- a/drivers/staging/wilc1000/wilc_memory.h +++ b/drivers/staging/wilc1000/wilc_memory.h @@ -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,33 +18,9 @@ * @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 * @param[in] strAttrs Optional attributes, NULL for default @@ -145,69 +117,6 @@ 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 */ #define WILC_MALLOC_EX(__size__, __attrs__) \ @@ -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 diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h index d89864c7697c..eec93b351f14 100644 --- a/drivers/staging/wilc1000/wilc_osconfig.h +++ b/drivers/staging/wilc1000/wilc_osconfig.h @@ -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 */ diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index 8b4c3dced981..fd5dd3c6316e 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -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" diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index 2f6484989565..36e2e707354b 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -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; -- 2.1.0.rc2