revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / input / evdev.c

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 43e94e5188ddeea9a5910224c80488ab27dd1173..9ddafc30f432236539f9304468d77e2daf761f7e 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -21,7 +21,6 @@
 #include <linux/input.h>
 #include <linux/major.h>
 #include <linux/device.h>
-#include <linux/wakelock.h>
 #include "input-compat.h"
 
 struct evdev {
@@ -41,8 +40,6 @@ struct evdev_client {
        int head;
        int tail;
        spinlock_t buffer_lock; /* protects access to buffer, head and tail */
-       struct wake_lock wake_lock;
-       char name[28];
        struct fasync_struct *fasync;
        struct evdev *evdev;
        struct list_head node;
@@ -62,7 +59,6 @@ static void evdev_pass_event(struct evdev_client *client,
         * "empty" by having client->head == client->tail.
         */
        spin_lock(&client->buffer_lock);
-       wake_lock_timeout(&client->wake_lock, 5 * HZ);
        do {
                client->buffer[client->head++] = *event;
                client->head &= client->bufsize - 1;
@@ -82,11 +78,8 @@ static void evdev_event(struct input_handle *handle,
        struct evdev *evdev = handle->private;
        struct evdev_client *client;
        struct input_event event;
-       struct timespec ts;
 
-       ktime_get_ts(&ts);
-       event.time.tv_sec = ts.tv_sec;
-       event.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+       do_gettimeofday(&event.time);
        event.type = type;
        event.code = code;
        event.value = value;
@@ -247,7 +240,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);
@@ -299,9 +291,6 @@ static int evdev_open(struct inode *inode, struct file *file)
 
        client->bufsize = bufsize;
        spin_lock_init(&client->buffer_lock);
-       snprintf(client->name, sizeof(client->name), "%s-%d",
-                       dev_name(&evdev->dev), task_tgid_vnr(current));
-       wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, client->name);
        client->evdev = evdev;
        evdev_attach_client(evdev, client);
 
@@ -316,7 +305,6 @@ static int evdev_open(struct inode *inode, struct file *file)
 
  err_free_client:
        evdev_detach_client(evdev, client);
-       wake_lock_destroy(&client->wake_lock);
        kfree(client);
  err_put_evdev:
        put_device(&evdev->dev);
@@ -368,8 +356,6 @@ static int evdev_fetch_next_event(struct evdev_client *client,
        if (have_event) {
                *event = client->buffer[client->tail++];
                client->tail &= client->bufsize - 1;
-               if (client->head == client->tail)
-                       wake_unlock(&client->wake_lock);
        }
 
        spin_unlock_irq(&client->buffer_lock);