From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757222AbbE2Uz7 (ORCPT ); Fri, 29 May 2015 16:55:59 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63767 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757171AbbE2Uwz (ORCPT ); Fri, 29 May 2015 16:52:55 -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, Arnd Bergmann Subject: [PATCH 09/16] staging: wilc1000: simplify semaphore wrapper Date: Fri, 29 May 2015 22:52:20 +0200 Message-Id: <1432932747-3739705-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1432932747-3739705-1-git-send-email-arnd@arndb.de> References: <1432932747-3739705-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:HeVpU9isM1WHmoLiwipY8Co2DoJMWDMsWz5XO5h8KvXokxg8NOt 6689aVdwZlp7wL/LPI2Sg4ec4LepNZhjPyliaXnf8CdN1ADa8lu+oanqXEzFnF6v2+DutzY e2K9Sj9oLDiZ5AwCstXXLGth//EWwG9APsDfnDMqoPapLMkUlHFNoumbTEncREKpfsW5yXm USBsF9wdEunzzRtYNyamg== X-UI-Out-Filterresults: notjunk:1;V01:K0:T6LfUhBRZgc=:Itp35lAxfzTwHaduKiUoE6 iziojtOS7ls9A3na6SYS4JIKcllgGaJxeHylwcPPL5PveLSWKpVdDy0URoOI0yXIwXTMeUaJO VAnb247K0a1O9+42UXKYSctIYPv1jvZRDzkmg7Zjw92MZm3pDOYg+UTxADrUTlxFDkon5kAdG N2GJSey9p6oRQSJDU/gQB+GDEXl20iEXOFJqwoL7d618a6cp0f3jiFqYk6tH4ipjEwi7Twlhi 0PJJWd9o+9Wg55rAH4qzFQ1ePLJuvToHT9a1V4IJrYhXv8MtCIqPUXWI96tV5+RO6j9SsLIW1 lfp86I8sXVBHNg3y2Wv2WRQJkeWFu1liVd69GS4AGIWsouDrXO1juV26Kz+qyP20I2xeG6wLW nhwQmwJbZLQidG2P5nNwCvsuL+MigxQpvg0dBrjKyrX96DoTtLkoAvW+F+6FZD6AEg16biAQD JwlOjCRoQpAFcM7WifuEQXARkC7VI5z8sZkHKimQDH3ddg5hMApx5gEqqnreM13vgddcdySfY IVLMJAIS/gfqteeDv/nfZbAwjJplGvED/UFTjQoC08sw/ajBHlX+QIX6R6vFD+aWgKq94SC1a MuarAG8RBAhmLh29C/6d7YTsEdmQt3ZPoKoz59kcfvhJarKyzG+y39OilT97+Ze0laQYRusXr TaI+iLW/uekanj0WBCm+Jp6XW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver has its own API for semaphores. This should be replaced with mutexes and completions, but for the moment we can start by removing the obviously unused parts. Signed-off-by: Arnd Bergmann --- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_semaphore.c | 14 -------------- drivers/staging/wilc1000/wilc_semaphore.h | 18 +----------------- 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h index eec93b351f14..d0bf08f89906 100644 --- a/drivers/staging/wilc1000/wilc_osconfig.h +++ b/drivers/staging/wilc1000/wilc_osconfig.h @@ -10,7 +10,6 @@ /* OS features supported */ -#define CONFIG_WILC_SEMAPHORE_FEATURE 1 /* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ #define CONFIG_WILC_SLEEP_FEATURE 1 #define CONFIG_WILC_SLEEP_HI_RES 1 diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index fd5dd3c6316e..32fe48a6034b 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -55,9 +55,7 @@ typedef WILC_Uint16 WILC_WideChar; #include "wilc_errorsupport.h" /* Semaphore support */ -#ifdef CONFIG_WILC_SEMAPHORE_FEATURE #include "wilc_semaphore.h" -#endif /* Sleep support */ #ifdef CONFIG_WILC_SLEEP_FEATURE diff --git a/drivers/staging/wilc1000/wilc_semaphore.c b/drivers/staging/wilc1000/wilc_semaphore.c index 637107bfb877..f09a88ca6ae4 100644 --- a/drivers/staging/wilc1000/wilc_semaphore.c +++ b/drivers/staging/wilc1000/wilc_semaphore.c @@ -1,7 +1,5 @@ #include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_SEMAPHORE_FEATURE - WILC_ErrNo WILC_SemaphoreCreate(WILC_SemaphoreHandle *pHandle, tstrWILC_SemaphoreAttrs *pstrAttrs) @@ -33,19 +31,9 @@ WILC_ErrNo WILC_SemaphoreAcquire(WILC_SemaphoreHandle *pHandle, { WILC_ErrNo s32RetStatus = WILC_SUCCESS; - #ifndef CONFIG_WILC_SEMAPHORE_TIMEOUT while (down_interruptible(pHandle)) ; - #else - if (pstrAttrs == WILC_NULL) { - down(pHandle); - } else { - - s32RetStatus = down_timeout(pHandle, msecs_to_jiffies(pstrAttrs->u32TimeOut)); - } - #endif - if (s32RetStatus == 0) { return WILC_SUCCESS; } else if (s32RetStatus == -ETIME) { @@ -66,5 +54,3 @@ WILC_ErrNo WILC_SemaphoreRelease(WILC_SemaphoreHandle *pHandle, return WILC_SUCCESS; } - -#endif diff --git a/drivers/staging/wilc1000/wilc_semaphore.h b/drivers/staging/wilc1000/wilc_semaphore.h index 3006f9f20c4d..3c0ecc326fb3 100644 --- a/drivers/staging/wilc1000/wilc_semaphore.h +++ b/drivers/staging/wilc1000/wilc_semaphore.h @@ -10,11 +10,6 @@ * @version 1.0 */ - -#ifndef CONFIG_WILC_SEMAPHORE_FEATURE -#error the feature WILC_OS_FEATURE_SEMAPHORE must be supported to include this file -#endif - /*! * @struct WILC_SemaphoreAttrs * @brief Semaphore API options @@ -28,14 +23,6 @@ typedef struct { */ WILC_Uint32 u32InitCount; - #ifdef CONFIG_WILC_SEMAPHORE_TIMEOUT - /*!< - * Timeout for use with WILC_SemaphoreAcquire, 0 to return immediately and - * WILC_OS_INFINITY to wait forever. default is WILC_OS_INFINITY - */ - WILC_Uint32 u32TimeOut; - #endif - } tstrWILC_SemaphoreAttrs; @@ -47,12 +34,9 @@ typedef struct { * @date 10 Aug 2010 * @version 1.0 */ -static void WILC_SemaphoreFillDefault(tstrWILC_SemaphoreAttrs *pstrAttrs) +static inline void WILC_SemaphoreFillDefault(tstrWILC_SemaphoreAttrs *pstrAttrs) { pstrAttrs->u32InitCount = 1; - #ifdef CONFIG_WILC_SEMAPHORE_TIMEOUT - pstrAttrs->u32TimeOut = WILC_OS_INFINITY; - #endif } /*! * @brief Creates a new Semaphore object -- 2.1.0.rc2