diff options
| author | Pavel Machek <pavel@ucw.cz> | 2009-10-22 11:03:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:10 -0800 |
| commit | ace9e7915badc44d0240b12ca9817b0171623f29 (patch) | |
| tree | 2ad5506d603006fa40e79eb5b4c74e0b583e362e /drivers/staging/dream/qdsp5 | |
| parent | 05d42522017df477f16c0ebc2d65aa8bde6e0e86 (diff) | |
| download | op-kernel-dev-ace9e7915badc44d0240b12ca9817b0171623f29.zip op-kernel-dev-ace9e7915badc44d0240b12ca9817b0171623f29.tar.gz | |
Staging: dream: remove wakelock support
Includes changed so that <linux/sched.h> is now needed for
TASK_INTERRUPTIBLE and friends, so include it.
Remove hooks for features not in mainline, such as earlysuspend and
wakelocks.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dream/qdsp5')
| -rw-r--r-- | drivers/staging/dream/qdsp5/adsp.c | 5 | ||||
| -rw-r--r-- | drivers/staging/dream/qdsp5/audio_out.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/dream/qdsp5/adsp.c b/drivers/staging/dream/qdsp5/adsp.c index d096456..9069535 100644 --- a/drivers/staging/dream/qdsp5/adsp.c +++ b/drivers/staging/dream/qdsp5/adsp.c @@ -32,16 +32,12 @@ #include <linux/module.h> #include <linux/uaccess.h> #include <linux/wait.h> -#include <linux/wakelock.h> -static struct wake_lock adsp_wake_lock; static inline void prevent_suspend(void) { - wake_lock(&adsp_wake_lock); } static inline void allow_suspend(void) { - wake_unlock(&adsp_wake_lock); } #include <linux/io.h> @@ -1046,7 +1042,6 @@ static int msm_adsp_probe(struct platform_device *pdev) pr_info("adsp: probe\n"); - wake_lock_init(&adsp_wake_lock, WAKE_LOCK_SUSPEND, "adsp"); #if CONFIG_MSM_AMSS_VERSION >= 6350 adsp_info.init_info_ptr = kzalloc( (sizeof(struct adsp_rtos_mp_mtoa_init_info_type)), GFP_KERNEL); diff --git a/drivers/staging/dream/qdsp5/audio_out.c b/drivers/staging/dream/qdsp5/audio_out.c index d1adcf6..df87ca3 100644 --- a/drivers/staging/dream/qdsp5/audio_out.c +++ b/drivers/staging/dream/qdsp5/audio_out.c @@ -38,8 +38,6 @@ #include <mach/qdsp5/qdsp5audppcmdi.h> #include <mach/qdsp5/qdsp5audppmsg.h> -#include <mach/htc_pwrsink.h> - #include "evlog.h" #define LOG_AUDIO_EVENTS 1 @@ -260,7 +258,6 @@ static int audio_enable(struct audio *audio) } audio->enabled = 1; - htc_pwrsink_set(PWRSINK_AUDIO, 100); return 0; } @@ -695,7 +692,6 @@ static int audio_release(struct inode *inode, struct file *file) audio_flush(audio); audio->opened = 0; mutex_unlock(&audio->lock); - htc_pwrsink_set(PWRSINK_AUDIO, 0); return 0; } |
