Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 14d4c0493c36c7da7ec4a0b0c3e55162a2b3b72a..a9a706f8fff90ef1f0faf0149e8d3b4c1b5dabad 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/module.h>
@@ -589,18 +588,9 @@ static inline void input_proc_exit(void) { }
 static ssize_t input_dev_show_##name(struct class_device *dev, char *buf)      \
 {                                                                              \
        struct input_dev *input_dev = to_input_dev(dev);                        \
-       int retval;                                                             \
                                                                                \
-       retval = mutex_lock_interruptible(&input_dev->mutex);                   \
-       if (retval)                                                             \
-               return retval;                                                  \
-                                                                               \
-       retval = scnprintf(buf, PAGE_SIZE,                                      \
-                          "%s\n", input_dev->name ? input_dev->name : "");     \
-                                                                               \
-       mutex_unlock(&input_dev->mutex);                                        \
-                                                                               \
-       return retval;                                                          \
+       return scnprintf(buf, PAGE_SIZE, "%s\n",                                \
+                        input_dev->name ? input_dev->name : "");               \
 }                                                                              \
 static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_##name, NULL);
 
@@ -1050,10 +1040,6 @@ void input_unregister_device(struct input_dev *dev)
        sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
        sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
 
-       mutex_lock(&dev->mutex);
-       dev->name = dev->phys = dev->uniq = NULL;
-       mutex_unlock(&dev->mutex);
-
        class_device_unregister(&dev->cdev);
 
        input_wakeup_procfs_readers();