From b96ff76a073a4502dd2fb6298d2582823eebc0f7 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 1 Jun 2015 21:06:39 +0200 Subject: [PATCH] staging: wilc1000: clean up sleep wrapper The driver has a simple wrapper around msleep, as well as a more advanced sleep function that is unused. This removes the unused code and the options to turn the feature on or off. A follow-up should rework the code to use msleep directly. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/wilc_osconfig.h | 2 -- drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_platform.h | 6 ----- drivers/staging/wilc1000/wilc_sleep.c | 10 -------- drivers/staging/wilc1000/wilc_sleep.h | 30 +---------------------- 5 files changed, 1 insertion(+), 49 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h index d0bf08f89906..6da42c837928 100644 --- a/drivers/staging/wilc1000/wilc_osconfig.h +++ b/drivers/staging/wilc1000/wilc_osconfig.h @@ -11,8 +11,6 @@ /* OS features supported */ /* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ -#define CONFIG_WILC_SLEEP_FEATURE 1 -#define CONFIG_WILC_SLEEP_HI_RES 1 #define CONFIG_WILC_TIMER_FEATURE 1 /* #define CONFIG_WILC_TIMER_PERIODIC 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index 32fe48a6034b..2af32fff84aa 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -58,9 +58,7 @@ typedef WILC_Uint16 WILC_WideChar; #include "wilc_semaphore.h" /* Sleep support */ -#ifdef CONFIG_WILC_SLEEP_FEATURE #include "wilc_sleep.h" -#endif /* Timer support */ #ifdef CONFIG_WILC_TIMER_FEATURE diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index 36e2e707354b..2c66c3f3a2c5 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -22,12 +22,6 @@ * #error This feature is not supported by this OS #endif*/ -/* CONFIG_WILC_SLEEP_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -/* #ifdef CONFIG_WILC_SLEEP_HI_RES */ -/* #error This feature is not supported by this OS */ -/* #endif */ /* CONFIG_WILC_TIMER_FEATURE is implemented */ diff --git a/drivers/staging/wilc1000/wilc_sleep.c b/drivers/staging/wilc1000/wilc_sleep.c index b8f45146956b..98a079f3d6c9 100644 --- a/drivers/staging/wilc1000/wilc_sleep.c +++ b/drivers/staging/wilc1000/wilc_sleep.c @@ -1,8 +1,6 @@ #include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_SLEEP_FEATURE - /* * @author mdaftedar * @date 10 Aug 2010 @@ -18,11 +16,3 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) } } -#endif - -/* #ifdef CONFIG_WILC_SLEEP_HI_RES */ -void WILC_SleepMicrosec(WILC_Uint32 u32TimeMicoSec) -{ - usleep_range(u32TimeMicoSec, u32TimeMicoSec); -} -/* #endif */ diff --git a/drivers/staging/wilc1000/wilc_sleep.h b/drivers/staging/wilc1000/wilc_sleep.h index d640fb553aca..2865c8e44346 100644 --- a/drivers/staging/wilc1000/wilc_sleep.h +++ b/drivers/staging/wilc1000/wilc_sleep.h @@ -1,19 +1,6 @@ #ifndef __WILC_SLEEP_H__ #define __WILC_SLEEP_H__ -/*! - * @file wilc_sleep.h - * @brief Sleep OS Wrapper functionality - * @author syounan - * @sa wilc_oswrapper.h top level OS wrapper file - * @date 10 Aug 2010 - * @version 1.0 - */ - -#ifndef CONFIG_WILC_SLEEP_FEATURE -#error the feature WILC_OS_FEATURE_SLEEP must be supported to include this file -#endif - /*! * @brief forces the current thread to sleep until the given time has elapsed * @param[in] u32TimeMilliSec Time to sleep in Milli seconds @@ -24,22 +11,7 @@ * @note This function offers a relatively innacurate and low resolution * sleep, for accurate high resolution sleep use u32TimeMicoSec */ +/* TODO: remove and open-code in callers */ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec); -#ifdef CONFIG_WILC_SLEEP_HI_RES -/*! - * @brief forces the current thread to sleep until the given time has elapsed - * @param[in] u32TimeMicoSec Time to sleep in Micro seconds - * @sa WILC_Sleep - * @author syounan - * @date 10 Aug 2010 - * @version 1.0 - * @note This function offers an acurare high resolution sleep, depends on - * the feature WILC_OS_FEATURE_SLEEP_HI_RES and may not be supported - * on all Operating Systems - */ -void WILC_SleepMicrosec(WILC_Uint32 u32TimeMicoSec); -#endif - - #endif -- 2.30.2