From a31bd964a21a5958886bd9e36bc2cdb61c474ce1 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 21 Jul 2013 11:09:05 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_WAKELOCK - not selected Signed-off-by: Larry Finger --- include/osdep_service.h | 7 +------ os_dep/osdep_service.c | 23 ----------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/include/osdep_service.h b/include/osdep_service.h index 9933b37..f96a0b5 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -518,11 +518,6 @@ __inline static u32 bitshift(u32 bitmask) // limitation of path length #define PATH_LENGTH_MAX PATH_MAX -// Suspend lock prevent system from going suspend -#ifdef CONFIG_WAKELOCK -#include -#endif - extern void rtw_suspend_lock_init(void); extern void rtw_suspend_lock_uninit(void); extern void rtw_lock_suspend(void); @@ -532,7 +527,7 @@ extern void rtw_lock_suspend_timeout(long timeout); #endif //CONFIG_WOWLAN //Atomic integer operations - #define ATOMIC_T atomic_t +#define ATOMIC_T atomic_t extern void ATOMIC_SET(ATOMIC_T *v, int i); extern int ATOMIC_READ(ATOMIC_T *v); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 9981e20..1e201ce 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -329,48 +329,25 @@ void rtw_yield_os(void) #define RTW_SUSPEND_LOCK_NAME "rtw_wifi" -#ifdef CONFIG_WAKELOCK -static struct wake_lock rtw_suspend_lock; -#endif - inline void rtw_suspend_lock_init(void) { - #ifdef CONFIG_WAKELOCK - wake_lock_init(&rtw_suspend_lock, WAKE_LOCK_SUSPEND, RTW_SUSPEND_LOCK_NAME); - #endif } inline void rtw_suspend_lock_uninit(void) { - #ifdef CONFIG_WAKELOCK - wake_lock_destroy(&rtw_suspend_lock); - #endif } inline void rtw_lock_suspend(void) { - #ifdef CONFIG_WAKELOCK - wake_lock(&rtw_suspend_lock); - #endif - - #if defined(CONFIG_WAKELOCK) - //DBG_88E("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); - #endif } inline void rtw_unlock_suspend(void) { - #ifdef CONFIG_WAKELOCK - wake_unlock(&rtw_suspend_lock); - #endif } #ifdef CONFIG_WOWLAN inline void rtw_lock_suspend_timeout(long timeout) { - #ifdef CONFIG_WAKELOCK - wake_lock_timeout(&rtw_suspend_lock, timeout); - #endif } #endif //CONFIG_WOWLAN