Commit 2d1cbb77 authored by Pavel Machek's avatar Pavel Machek Committed by Greg Kroah-Hartman

Staging: dream: remove last bits of earlysuspend support

Remove last bits of earlysuspend support.
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 251211c3
* remove support for wakelocks since those are not in mainline
* camera driver uses old V4L API * camera driver uses old V4L API
......
...@@ -182,9 +182,6 @@ struct audio { ...@@ -182,9 +182,6 @@ struct audio {
int stopped; /* set when stopped, cleared on flush */ int stopped; /* set when stopped, cleared on flush */
unsigned volume; unsigned volume;
struct wake_lock wakelock;
struct wake_lock idlelock;
int adrc_enable; int adrc_enable;
struct adrc_filter adrc; struct adrc_filter adrc;
...@@ -198,14 +195,10 @@ struct audio { ...@@ -198,14 +195,10 @@ struct audio {
static void audio_prevent_sleep(struct audio *audio) static void audio_prevent_sleep(struct audio *audio)
{ {
printk(KERN_INFO "++++++++++++++++++++++++++++++\n"); printk(KERN_INFO "++++++++++++++++++++++++++++++\n");
wake_lock(&audio->wakelock);
wake_lock(&audio->idlelock);
} }
static void audio_allow_sleep(struct audio *audio) static void audio_allow_sleep(struct audio *audio)
{ {
wake_unlock(&audio->wakelock);
wake_unlock(&audio->idlelock);
printk(KERN_INFO "------------------------------\n"); printk(KERN_INFO "------------------------------\n");
} }
...@@ -840,8 +833,6 @@ static int __init audio_init(void) ...@@ -840,8 +833,6 @@ static int __init audio_init(void)
mutex_init(&the_audio.write_lock); mutex_init(&the_audio.write_lock);
spin_lock_init(&the_audio.dsp_lock); spin_lock_init(&the_audio.dsp_lock);
init_waitqueue_head(&the_audio.wait); init_waitqueue_head(&the_audio.wait);
wake_lock_init(&the_audio.wakelock, WAKE_LOCK_SUSPEND, "audio_pcm");
wake_lock_init(&the_audio.idlelock, WAKE_LOCK_IDLE, "audio_pcm_idle");
return (misc_register(&audio_misc) || misc_register(&audpp_misc)); return (misc_register(&audio_misc) || misc_register(&audpp_misc));
} }
......
...@@ -42,7 +42,6 @@ static struct msm_rpc_endpoint *endpoint; ...@@ -42,7 +42,6 @@ static struct msm_rpc_endpoint *endpoint;
static LIST_HEAD(rpc_server_list); static LIST_HEAD(rpc_server_list);
static DEFINE_MUTEX(rpc_server_list_lock); static DEFINE_MUTEX(rpc_server_list_lock);
static int rpc_servers_active; static int rpc_servers_active;
static struct wake_lock rpc_servers_wake_lock;
static void rpc_server_register(struct msm_rpc_server *server) static void rpc_server_register(struct msm_rpc_server *server)
{ {
...@@ -136,10 +135,8 @@ static int rpc_servers_thread(void *data) ...@@ -136,10 +135,8 @@ static int rpc_servers_thread(void *data)
int rc; int rc;
for (;;) { for (;;) {
wake_unlock(&rpc_servers_wake_lock);
rc = wait_event_interruptible(endpoint->wait_q, rc = wait_event_interruptible(endpoint->wait_q,
!list_empty(&endpoint->read_q)); !list_empty(&endpoint->read_q));
wake_lock(&rpc_servers_wake_lock);
rc = msm_rpc_read(endpoint, &buffer, -1, -1); rc = msm_rpc_read(endpoint, &buffer, -1, -1);
if (rc < 0) { if (rc < 0) {
printk(KERN_ERR "%s: could not read: %d\n", printk(KERN_ERR "%s: could not read: %d\n",
...@@ -219,7 +216,6 @@ static struct platform_driver rpcservers_driver = { ...@@ -219,7 +216,6 @@ static struct platform_driver rpcservers_driver = {
static int __init rpc_servers_init(void) static int __init rpc_servers_init(void)
{ {
wake_lock_init(&rpc_servers_wake_lock, WAKE_LOCK_SUSPEND, "rpc_server");
return platform_driver_register(&rpcservers_driver); return platform_driver_register(&rpcservers_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment