From c3fcce97b4d9359074faae5e9301b0114dbb10e1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 22:57:54 +0800
Subject: [PATCH] Revert "Input: Hold wake lock while event queue is not
empty."
This reverts commit a92683626c2061c51701917c5dcbd0e1c91a04e2.
---
drivers/input/evdev.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 3e188a76ad12..dee6706038aa 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -20,7 +20,6 @@
#include <linux/input.h>
#include <linux/major.h>
#include <linux/device.h>
-#include <linux/wakelock.h>
#include "input-compat.h"
struct evdev {
@@ -44,7 +43,6 @@ struct evdev_client {
struct fasync_struct *fasync;
struct evdev *evdev;
struct list_head node;
- struct wake_lock wake_lock;
};
static struct evdev *evdev_table[EVDEV_MINORS];
@@ -57,7 +55,6 @@ static void evdev_pass_event(struct evdev_client *client,
* Interrupts are disabled, just acquire the lock
*/
spin_lock(&client->buffer_lock);
- wake_lock_timeout(&client->wake_lock, 5 * HZ);
client->buffer[client->head++] = *event;
client->head &= EVDEV_BUFFER_SIZE - 1;
spin_unlock(&client->buffer_lock);
@@ -236,7 +233,6 @@ static int evdev_release(struct inode *inode, struct file *file)
mutex_unlock(&evdev->mutex);
evdev_detach_client(evdev, client);
- wake_lock_destroy(&client->wake_lock);
kfree(client);
evdev_close_device(evdev);
@@ -273,7 +269,6 @@ static int evdev_open(struct inode *inode, struct file *file)
}
spin_lock_init(&client->buffer_lock);
- wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, "evdev");
client->evdev = evdev;
evdev_attach_client(evdev, client);
@@ -337,8 +332,6 @@ static int evdev_fetch_next_event(struct evdev_client *client,
if (have_event) {
*event = client->buffer[client->tail++];
client->tail &= EVDEV_BUFFER_SIZE - 1;
- if (client->head == client->tail)
- wake_unlock(&client->wake_lock);
}
spin_unlock_irq(&client->buffer_lock);
--
2.34.1