diff options
author | Justin P. Mattock <justinmattock@gmail.com> | 2011-01-19 22:16:05 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-20 15:34:34 -0800 |
commit | e6856764dc677aed6c1edb317f60b35194913b0d (patch) | |
tree | 59eb9ff20b03f3d9199997ecb5e87c34f8b54e35 /drivers/staging/ath6kl/os/linux/ar6000_android.c | |
parent | 2ae44d64b770832451b112c6e3d4d5ab0aef66c2 (diff) | |
download | op-kernel-dev-e6856764dc677aed6c1edb317f60b35194913b0d.zip op-kernel-dev-e6856764dc677aed6c1edb317f60b35194913b0d.tar.gz |
staging: ath6kl Remove CONFIG_HAS_WAKELOCK
The patch below removes CONFIG_HAS_WAKELOCK since it is no longer in the kernel.
Please let me know, if this is the proper way of doing this and/or more needs
to be done..
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/ar6000_android.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_android.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c index a588825..dbde05f 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_android.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c @@ -25,9 +25,6 @@ #include <linux/vmalloc.h> #include <linux/fs.h> -#ifdef CONFIG_HAS_WAKELOCK -#include <linux/wakelock.h> -#endif #ifdef CONFIG_HAS_EARLYSUSPEND #include <linux/earlysuspend.h> #endif @@ -44,11 +41,6 @@ extern int bmienable; extern struct net_device *ar6000_devices[]; extern char ifname[]; -#ifdef CONFIG_HAS_WAKELOCK -extern struct wake_lock ar6k_wow_wake_lock; -struct wake_lock ar6k_init_wake_lock; -#endif - const char def_ifname[] = "wlan0"; module_param_string(fwpath, fwpath, sizeof(fwpath), 0644); module_param(enablelogcat, uint, 0644); @@ -280,14 +272,8 @@ void android_release_firmware(const struct firmware *firmware) static A_STATUS ar6000_android_avail_ev(void *context, void *hif_handle) { A_STATUS ret; -#ifdef CONFIG_HAS_WAKELOCK - wake_lock(&ar6k_init_wake_lock); -#endif ar6000_enable_mmchost_detect_change(0); ret = ar6000_avail_ev_p(context, hif_handle); -#ifdef CONFIG_HAS_WAKELOCK - wake_unlock(&ar6k_init_wake_lock); -#endif return ret; } @@ -328,9 +314,6 @@ void android_module_init(OSDRV_CALLBACKS *osdrvCallbacks) bmienable = 1; if (ifname[0] == '\0') strcpy(ifname, def_ifname); -#ifdef CONFIG_HAS_WAKELOCK - wake_lock_init(&ar6k_init_wake_lock, WAKE_LOCK_SUSPEND, "ar6k_init"); -#endif #ifdef CONFIG_HAS_EARLYSUSPEND ar6k_early_suspend.suspend = android_early_suspend; ar6k_early_suspend.resume = android_late_resume; @@ -349,9 +332,6 @@ void android_module_exit(void) #ifdef CONFIG_HAS_EARLYSUSPEND unregister_early_suspend(&ar6k_early_suspend); #endif -#ifdef CONFIG_HAS_WAKELOCK - wake_lock_destroy(&ar6k_init_wake_lock); -#endif ar6000_enable_mmchost_detect_change(1); } @@ -395,9 +375,6 @@ void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, A_BOOL i } if (needWake) { /* keep host wake up if there is any event and packate comming in*/ -#ifdef CONFIG_HAS_WAKELOCK - wake_lock_timeout(&ar6k_wow_wake_lock, 3*HZ); -#endif if (wowledon) { char buf[32]; int len = sprintf(buf, "on"); |