Input: fix formatting to better follow CodingStyle
[linux-2.6.git] / drivers / input / input.c
index 43b49cc..7570a3f 100644 (file)
 #include <linux/random.h>
 #include <linux/major.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
 MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(input_allocate_device);
+EXPORT_SYMBOL(input_free_device);
 EXPORT_SYMBOL(input_register_device);
 EXPORT_SYMBOL(input_unregister_device);
 EXPORT_SYMBOL(input_register_handler);
@@ -61,11 +64,13 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
                case EV_SYN:
                        switch (code) {
                                case SYN_CONFIG:
-                                       if (dev->event) dev->event(dev, type, code, value);
+                                       if (dev->event)
+                                               dev->event(dev, type, code, value);
                                        break;
 
                                case SYN_REPORT:
-                                       if (dev->sync) return;
+                                       if (dev->sync)
+                                               return;
                                        dev->sync = 1;
                                        break;
                        }
@@ -134,7 +139,8 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
                        if (code > MSC_MAX || !test_bit(code, dev->mscbit))
                                return;
 
-                       if (dev->event) dev->event(dev, type, code, value);
+                       if (dev->event)
+                               dev->event(dev, type, code, value);
 
                        break;
 
@@ -144,7 +150,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
                                return;
 
                        change_bit(code, dev->led);
-                       if (dev->event) dev->event(dev, type, code, value);
+
+                       if (dev->event)
+                               dev->event(dev, type, code, value);
 
                        break;
 
@@ -153,21 +161,28 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
                        if (code > SND_MAX || !test_bit(code, dev->sndbit))
                                return;
 
-                       if (dev->event) dev->event(dev, type, code, value);
+                       if (!!test_bit(code, dev->snd) != !!value)
+                               change_bit(code, dev->snd);
+
+                       if (dev->event)
+                               dev->event(dev, type, code, value);
 
                        break;
 
                case EV_REP:
 
-                       if (code > REP_MAX || value < 0 || dev->rep[code] == value) return;
+                       if (code > REP_MAX || value < 0 || dev->rep[code] == value)
+                               return;
 
                        dev->rep[code] = value;
-                       if (dev->event) dev->event(dev, type, code, value);
+                       if (dev->event)
+                               dev->event(dev, type, code, value);
 
                        break;
 
                case EV_FF:
-                       if (dev->event) dev->event(dev, type, code, value);
+                       if (dev->event)
+                               dev->event(dev, type, code, value);
                        break;
        }
 
@@ -224,7 +239,7 @@ int input_open_device(struct input_handle *handle)
        struct input_dev *dev = handle->dev;
        int err;
 
-       err = down_interruptible(&dev->sem);
+       err = mutex_lock_interruptible(&dev->mutex);
        if (err)
                return err;
 
@@ -236,7 +251,7 @@ int input_open_device(struct input_handle *handle)
        if (err)
                handle->open--;
 
-       up(&dev->sem);
+       mutex_unlock(&dev->mutex);
 
        return err;
 }
@@ -255,13 +270,13 @@ void input_close_device(struct input_handle *handle)
 
        input_release_device(handle);
 
-       down(&dev->sem);
+       mutex_lock(&dev->mutex);
 
        if (!--dev->users && dev->close)
                dev->close(dev);
        handle->open--;
 
-       up(&dev->sem);
+       mutex_unlock(&dev->mutex);
 }
 
 static void input_link_handle(struct input_handle *handle)
@@ -284,19 +299,19 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
        for (; id->flags || id->driver_info; id++) {
 
                if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)
-                       if (id->id.bustype != dev->id.bustype)
+                       if (id->bustype != dev->id.bustype)
                                continue;
 
                if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)
-                       if (id->id.vendor != dev->id.vendor)
+                       if (id->vendor != dev->id.vendor)
                                continue;
 
                if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)
-                       if (id->id.product != dev->id.product)
+                       if (id->product != dev->id.product)
                                continue;
 
                if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)
-                       if (id->id.version != dev->id.version)
+                       if (id->version != dev->id.version)
                                continue;
 
                MATCH_BIT(evbit,  EV_MAX);
@@ -315,21 +330,6 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
        return NULL;
 }
 
-static int input_print_bitmap(char *buf, int buf_size, unsigned long *bitmap, int max)
-{
-       int i;
-       int len = 0;
-
-       for (i = NBITS(max) - 1; i > 0; i--)
-               if (bitmap[i])
-                       break;
-
-       for (; i >= 0; i--)
-               len += snprintf(buf + len, max(buf_size - len, 0),
-                               "%lx%s", bitmap[i], i > 0 ? " " : "");
-       return len;
-}
-
 #ifdef CONFIG_PROC_FS
 
 static struct proc_dir_entry *proc_bus_input_dir;
@@ -342,124 +342,182 @@ static inline void input_wakeup_procfs_readers(void)
        wake_up(&input_devices_poll_wait);
 }
 
-static unsigned int input_devices_poll(struct file *file, poll_table *wait)
+static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait)
 {
        int state = input_devices_state;
+
        poll_wait(file, &input_devices_poll_wait, wait);
        if (state != input_devices_state)
                return POLLIN | POLLRDNORM;
+
        return 0;
 }
 
-#define SPRINTF_BIT(ev, bm)                                            \
-       do {                                                            \
-               len += sprintf(buf + len, "B: %s=", #ev);               \
-               len += input_print_bitmap(buf + len, INT_MAX,           \
-                                       dev->bm##bit, ev##_MAX);        \
-               len += sprintf(buf + len, "\n");                        \
-       } while (0)
+static struct list_head *list_get_nth_element(struct list_head *list, loff_t *pos)
+{
+       struct list_head *node;
+       loff_t i = 0;
 
-#define TEST_AND_SPRINTF_BIT(ev, bm)                                   \
-       do {                                                            \
-               if (test_bit(EV_##ev, dev->evbit))                      \
-                       SPRINTF_BIT(ev, bm);                            \
-       } while (0)
+       list_for_each(node, list)
+               if (i++ == *pos)
+                       return node;
 
-static int input_devices_read(char *buf, char **start, off_t pos, int count, int *eof, void *data)
+       return NULL;
+}
+
+static struct list_head *list_get_next_element(struct list_head *list, struct list_head *element, loff_t *pos)
 {
-       struct input_dev *dev;
-       struct input_handle *handle;
-       const char *path;
+       if (element->next == list)
+               return NULL;
 
-       off_t at = 0;
-       int len, cnt = 0;
+       ++(*pos);
+       return element->next;
+}
 
-       list_for_each_entry(dev, &input_dev_list, node) {
+static void *input_devices_seq_start(struct seq_file *seq, loff_t *pos)
+{
+       /* acquire lock here ... Yes, we do need locking, I knowi, I know... */
 
-               path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
+       return list_get_nth_element(&input_dev_list, pos);
+}
 
-               len = sprintf(buf, "I: Bus=%04x Vendor=%04x Product=%04x Version=%04x\n",
-                       dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version);
+static void *input_devices_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+       return list_get_next_element(&input_dev_list, v, pos);
+}
 
-               len += sprintf(buf + len, "N: Name=\"%s\"\n", dev->name ? dev->name : "");
-               len += sprintf(buf + len, "P: Phys=%s\n", dev->phys ? dev->phys : "");
-               len += sprintf(buf + len, "S: Sysfs=%s\n", path ? path : "");
-               len += sprintf(buf + len, "H: Handlers=");
+static void input_devices_seq_stop(struct seq_file *seq, void *v)
+{
+       /* release lock here */
+}
 
-               list_for_each_entry(handle, &dev->h_list, d_node)
-                       len += sprintf(buf + len, "%s ", handle->name);
-
-               len += sprintf(buf + len, "\n");
-
-               SPRINTF_BIT(EV, ev);
-               TEST_AND_SPRINTF_BIT(KEY, key);
-               TEST_AND_SPRINTF_BIT(REL, rel);
-               TEST_AND_SPRINTF_BIT(ABS, abs);
-               TEST_AND_SPRINTF_BIT(MSC, msc);
-               TEST_AND_SPRINTF_BIT(LED, led);
-               TEST_AND_SPRINTF_BIT(SND, snd);
-               TEST_AND_SPRINTF_BIT(FF, ff);
-               TEST_AND_SPRINTF_BIT(SW, sw);
-
-               len += sprintf(buf + len, "\n");
-
-               at += len;
-
-               if (at >= pos) {
-                       if (!*start) {
-                               *start = buf + (pos - (at - len));
-                               cnt = at - pos;
-                       } else  cnt += len;
-                       buf += len;
-                       if (cnt >= count)
-                               break;
-               }
+static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
+                                  unsigned long *bitmap, int max)
+{
+       int i;
 
-               kfree(path);
-       }
+       for (i = NBITS(max) - 1; i > 0; i--)
+               if (bitmap[i])
+                       break;
+
+       seq_printf(seq, "B: %s=", name);
+       for (; i >= 0; i--)
+               seq_printf(seq, "%lx%s", bitmap[i], i > 0 ? " " : "");
+       seq_putc(seq, '\n');
+}
+
+static int input_devices_seq_show(struct seq_file *seq, void *v)
+{
+       struct input_dev *dev = container_of(v, struct input_dev, node);
+       const char *path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
+       struct input_handle *handle;
+
+       seq_printf(seq, "I: Bus=%04x Vendor=%04x Product=%04x Version=%04x\n",
+                  dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version);
+
+       seq_printf(seq, "N: Name=\"%s\"\n", dev->name ? dev->name : "");
+       seq_printf(seq, "P: Phys=%s\n", dev->phys ? dev->phys : "");
+       seq_printf(seq, "S: Sysfs=%s\n", path ? path : "");
+       seq_printf(seq, "H: Handlers=");
+
+       list_for_each_entry(handle, &dev->h_list, d_node)
+               seq_printf(seq, "%s ", handle->name);
+       seq_putc(seq, '\n');
+
+       input_seq_print_bitmap(seq, "EV", dev->evbit, EV_MAX);
+       if (test_bit(EV_KEY, dev->evbit))
+               input_seq_print_bitmap(seq, "KEY", dev->keybit, KEY_MAX);
+       if (test_bit(EV_REL, dev->evbit))
+               input_seq_print_bitmap(seq, "REL", dev->relbit, REL_MAX);
+       if (test_bit(EV_ABS, dev->evbit))
+               input_seq_print_bitmap(seq, "ABS", dev->absbit, ABS_MAX);
+       if (test_bit(EV_MSC, dev->evbit))
+               input_seq_print_bitmap(seq, "MSC", dev->mscbit, MSC_MAX);
+       if (test_bit(EV_LED, dev->evbit))
+               input_seq_print_bitmap(seq, "LED", dev->ledbit, LED_MAX);
+       if (test_bit(EV_SND, dev->evbit))
+               input_seq_print_bitmap(seq, "SND", dev->sndbit, SND_MAX);
+       if (test_bit(EV_FF, dev->evbit))
+               input_seq_print_bitmap(seq, "FF", dev->ffbit, FF_MAX);
+       if (test_bit(EV_SW, dev->evbit))
+               input_seq_print_bitmap(seq, "SW", dev->swbit, SW_MAX);
 
-       if (&dev->node == &input_dev_list)
-               *eof = 1;
+       seq_putc(seq, '\n');
 
-       return (count > cnt) ? cnt : count;
+       kfree(path);
+       return 0;
 }
 
-static int input_handlers_read(char *buf, char **start, off_t pos, int count, int *eof, void *data)
+static struct seq_operations input_devices_seq_ops = {
+       .start  = input_devices_seq_start,
+       .next   = input_devices_seq_next,
+       .stop   = input_devices_seq_stop,
+       .show   = input_devices_seq_show,
+};
+
+static int input_proc_devices_open(struct inode *inode, struct file *file)
 {
-       struct input_handler *handler;
+       return seq_open(file, &input_devices_seq_ops);
+}
 
-       off_t at = 0;
-       int len = 0, cnt = 0;
-       int i = 0;
+static struct file_operations input_devices_fileops = {
+       .owner          = THIS_MODULE,
+       .open           = input_proc_devices_open,
+       .poll           = input_proc_devices_poll,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
+
+static void *input_handlers_seq_start(struct seq_file *seq, loff_t *pos)
+{
+       /* acquire lock here ... Yes, we do need locking, I knowi, I know... */
+       seq->private = (void *)(unsigned long)*pos;
+       return list_get_nth_element(&input_handler_list, pos);
+}
+
+static void *input_handlers_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+       seq->private = (void *)(unsigned long)(*pos + 1);
+       return list_get_next_element(&input_handler_list, v, pos);
+}
 
-       list_for_each_entry(handler, &input_handler_list, node) {
+static void input_handlers_seq_stop(struct seq_file *seq, void *v)
+{
+       /* release lock here */
+}
 
-               if (handler->fops)
-                       len = sprintf(buf, "N: Number=%d Name=%s Minor=%d\n",
-                               i++, handler->name, handler->minor);
-               else
-                       len = sprintf(buf, "N: Number=%d Name=%s\n",
-                               i++, handler->name);
+static int input_handlers_seq_show(struct seq_file *seq, void *v)
+{
+       struct input_handler *handler = container_of(v, struct input_handler, node);
 
-               at += len;
+       seq_printf(seq, "N: Number=%ld Name=%s",
+                  (unsigned long)seq->private, handler->name);
+       if (handler->fops)
+               seq_printf(seq, " Minor=%d", handler->minor);
+       seq_putc(seq, '\n');
 
-               if (at >= pos) {
-                       if (!*start) {
-                               *start = buf + (pos - (at - len));
-                               cnt = at - pos;
-                       } else  cnt += len;
-                       buf += len;
-                       if (cnt >= count)
-                               break;
-               }
-       }
-       if (&handler->node == &input_handler_list)
-               *eof = 1;
+       return 0;
+}
+static struct seq_operations input_handlers_seq_ops = {
+       .start  = input_handlers_seq_start,
+       .next   = input_handlers_seq_next,
+       .stop   = input_handlers_seq_stop,
+       .show   = input_handlers_seq_show,
+};
 
-       return (count > cnt) ? cnt : count;
+static int input_proc_handlers_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &input_handlers_seq_ops);
 }
 
-static struct file_operations input_fileops;
+static struct file_operations input_handlers_fileops = {
+       .owner          = THIS_MODULE,
+       .open           = input_proc_handlers_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
 
 static int __init input_proc_init(void)
 {
@@ -471,20 +529,19 @@ static int __init input_proc_init(void)
 
        proc_bus_input_dir->owner = THIS_MODULE;
 
-       entry = create_proc_read_entry("devices", 0, proc_bus_input_dir, input_devices_read, NULL);
+       entry = create_proc_entry("devices", 0, proc_bus_input_dir);
        if (!entry)
                goto fail1;
 
        entry->owner = THIS_MODULE;
-       input_fileops = *entry->proc_fops;
-       entry->proc_fops = &input_fileops;
-       entry->proc_fops->poll = input_devices_poll;
+       entry->proc_fops = &input_devices_fileops;
 
-       entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);
+       entry = create_proc_entry("handlers", 0, proc_bus_input_dir);
        if (!entry)
                goto fail2;
 
        entry->owner = THIS_MODULE;
+       entry->proc_fops = &input_handlers_fileops;
 
        return 0;
 
@@ -512,13 +569,14 @@ 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 = down_interruptible(&input_dev->sem);                           \
+       retval = mutex_lock_interruptible(&input_dev->mutex);                   \
        if (retval)                                                             \
                return retval;                                                  \
                                                                                \
-       retval = sprintf(buf, "%s\n", input_dev->name ? input_dev->name : "");  \
+       retval = scnprintf(buf, PAGE_SIZE,                                      \
+                          "%s\n", input_dev->name ? input_dev->name : "");     \
                                                                                \
-       up(&input_dev->sem);                                                    \
+       mutex_unlock(&input_dev->mutex);                                        \
                                                                                \
        return retval;                                                          \
 }                                                                              \
@@ -528,10 +586,70 @@ INPUT_DEV_STRING_ATTR_SHOW(name);
 INPUT_DEV_STRING_ATTR_SHOW(phys);
 INPUT_DEV_STRING_ATTR_SHOW(uniq);
 
+static int input_print_modalias_bits(char *buf, int size,
+                                    char name, unsigned long *bm,
+                                    unsigned int min_bit, unsigned int max_bit)
+{
+       int len = 0, i;
+
+       len += snprintf(buf, max(size, 0), "%c", name);
+       for (i = min_bit; i < max_bit; i++)
+               if (bm[LONG(i)] & BIT(i))
+                       len += snprintf(buf + len, max(size - len, 0), "%X,", i);
+       return len;
+}
+
+static int input_print_modalias(char *buf, int size, struct input_dev *id,
+                               int add_cr)
+{
+       int len;
+
+       len = snprintf(buf, max(size, 0),
+                      "input:b%04Xv%04Xp%04Xe%04X-",
+                      id->id.bustype, id->id.vendor,
+                      id->id.product, id->id.version);
+
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'e', id->evbit, 0, EV_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'k', id->keybit, KEY_MIN_INTERESTING, KEY_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'r', id->relbit, 0, REL_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'a', id->absbit, 0, ABS_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'm', id->mscbit, 0, MSC_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'l', id->ledbit, 0, LED_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               's', id->sndbit, 0, SND_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'f', id->ffbit, 0, FF_MAX);
+       len += input_print_modalias_bits(buf + len, size - len,
+                               'w', id->swbit, 0, SW_MAX);
+
+       if (add_cr)
+               len += snprintf(buf + len, max(size - len, 0), "\n");
+
+       return len;
+}
+
+static ssize_t input_dev_show_modalias(struct class_device *dev, char *buf)
+{
+       struct input_dev *id = to_input_dev(dev);
+       ssize_t len;
+
+       len = input_print_modalias(buf, PAGE_SIZE, id, 1);
+
+       return min_t(int, len, PAGE_SIZE);
+}
+static CLASS_DEVICE_ATTR(modalias, S_IRUGO, input_dev_show_modalias, NULL);
+
 static struct attribute *input_dev_attrs[] = {
        &class_device_attr_name.attr,
        &class_device_attr_phys.attr,
        &class_device_attr_uniq.attr,
+       &class_device_attr_modalias.attr,
        NULL
 };
 
@@ -543,7 +661,7 @@ static struct attribute_group input_dev_attr_group = {
 static ssize_t input_dev_show_id_##name(struct class_device *dev, char *buf)   \
 {                                                                              \
        struct input_dev *input_dev = to_input_dev(dev);                        \
-       return sprintf(buf, "%04x\n", input_dev->id.name);                      \
+       return scnprintf(buf, PAGE_SIZE, "%04x\n", input_dev->id.name);         \
 }                                                                              \
 static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_id_##name, NULL);
 
@@ -565,11 +683,33 @@ static struct attribute_group input_dev_id_attr_group = {
        .attrs  = input_dev_id_attrs,
 };
 
+static int input_print_bitmap(char *buf, int buf_size, unsigned long *bitmap,
+                             int max, int add_cr)
+{
+       int i;
+       int len = 0;
+
+       for (i = NBITS(max) - 1; i > 0; i--)
+               if (bitmap[i])
+                       break;
+
+       for (; i >= 0; i--)
+               len += snprintf(buf + len, max(buf_size - len, 0),
+                               "%lx%s", bitmap[i], i > 0 ? " " : "");
+
+       if (add_cr)
+               len += snprintf(buf + len, max(buf_size - len, 0), "\n");
+
+       return len;
+}
+
 #define INPUT_DEV_CAP_ATTR(ev, bm)                                             \
 static ssize_t input_dev_show_cap_##bm(struct class_device *dev, char *buf)    \
 {                                                                              \
        struct input_dev *input_dev = to_input_dev(dev);                        \
-       return input_print_bitmap(buf, PAGE_SIZE, input_dev->bm##bit, ev##_MAX);\
+       int len = input_print_bitmap(buf, PAGE_SIZE,                            \
+                                    input_dev->bm##bit, ev##_MAX, 1);          \
+       return min_t(int, len, PAGE_SIZE);                                      \
 }                                                                              \
 static CLASS_DEVICE_ATTR(bm, S_IRUGO, input_dev_show_cap_##bm, NULL);
 
@@ -610,12 +750,12 @@ static void input_dev_release(struct class_device *class_dev)
 }
 
 /*
- * Input hotplugging interface - loading event handlers based on
+ * Input uevent interface - loading event handlers based on
  * device bitfields.
  */
-static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
-                                   char *buffer, int buffer_size, int *cur_len,
-                                   const char *name, unsigned long *bitmap, int max)
+static int input_add_uevent_bm_var(char **envp, int num_envp, int *cur_index,
+                                  char *buffer, int buffer_size, int *cur_len,
+                                  const char *name, unsigned long *bitmap, int max)
 {
        if (*cur_index >= num_envp - 1)
                return -ENOMEM;
@@ -623,12 +763,36 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
        envp[*cur_index] = buffer + *cur_len;
 
        *cur_len += snprintf(buffer + *cur_len, max(buffer_size - *cur_len, 0), name);
-       if (*cur_len > buffer_size)
+       if (*cur_len >= buffer_size)
                return -ENOMEM;
 
        *cur_len += input_print_bitmap(buffer + *cur_len,
                                        max(buffer_size - *cur_len, 0),
-                                       bitmap, max) + 1;
+                                       bitmap, max, 0) + 1;
+       if (*cur_len > buffer_size)
+               return -ENOMEM;
+
+       (*cur_index)++;
+       return 0;
+}
+
+static int input_add_uevent_modalias_var(char **envp, int num_envp, int *cur_index,
+                                        char *buffer, int buffer_size, int *cur_len,
+                                        struct input_dev *dev)
+{
+       if (*cur_index >= num_envp - 1)
+               return -ENOMEM;
+
+       envp[*cur_index] = buffer + *cur_len;
+
+       *cur_len += snprintf(buffer + *cur_len, max(buffer_size - *cur_len, 0),
+                            "MODALIAS=");
+       if (*cur_len >= buffer_size)
+               return -ENOMEM;
+
+       *cur_len += input_print_modalias(buffer + *cur_len,
+                                        max(buffer_size - *cur_len, 0),
+                                        dev, 0) + 1;
        if (*cur_len > buffer_size)
                return -ENOMEM;
 
@@ -638,7 +802,7 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
 
 #define INPUT_ADD_HOTPLUG_VAR(fmt, val...)                             \
        do {                                                            \
-               int err = add_hotplug_env_var(envp, num_envp, &i,       \
+               int err = add_uevent_var(envp, num_envp, &i,            \
                                        buffer, buffer_size, &len,      \
                                        fmt, val);                      \
                if (err)                                                \
@@ -647,15 +811,25 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
 
 #define INPUT_ADD_HOTPLUG_BM_VAR(name, bm, max)                                \
        do {                                                            \
-               int err = input_add_hotplug_bm_var(envp, num_envp, &i,  \
+               int err = input_add_uevent_bm_var(envp, num_envp, &i,   \
                                        buffer, buffer_size, &len,      \
                                        name, bm, max);                 \
                if (err)                                                \
                        return err;                                     \
        } while (0)
 
-static int input_dev_hotplug(struct class_device *cdev, char **envp,
-                            int num_envp, char *buffer, int buffer_size)
+#define INPUT_ADD_HOTPLUG_MODALIAS_VAR(dev)                            \
+       do {                                                            \
+               int err = input_add_uevent_modalias_var(envp,           \
+                                       num_envp, &i,                   \
+                                       buffer, buffer_size, &len,      \
+                                       dev);                           \
+               if (err)                                                \
+                       return err;                                     \
+       } while (0)
+
+static int input_dev_uevent(struct class_device *cdev, char **envp,
+                           int num_envp, char *buffer, int buffer_size)
 {
        struct input_dev *dev = to_input_dev(cdev);
        int i = 0;
@@ -689,15 +863,16 @@ static int input_dev_hotplug(struct class_device *cdev, char **envp,
        if (test_bit(EV_SW, dev->evbit))
                INPUT_ADD_HOTPLUG_BM_VAR("SW=", dev->swbit, SW_MAX);
 
-       envp[i] = NULL;
+       INPUT_ADD_HOTPLUG_MODALIAS_VAR(dev);
 
+       envp[i] = NULL;
        return 0;
 }
 
 struct class input_class = {
        .name                   = "input",
        .release                = input_dev_release,
-       .hotplug                = input_dev_hotplug,
+       .uevent                 = input_dev_uevent,
 };
 
 struct input_dev *input_allocate_device(void)
@@ -709,6 +884,7 @@ struct input_dev *input_allocate_device(void)
                dev->dynalloc = 1;
                dev->cdev.class = &input_class;
                class_device_initialize(&dev->cdev);
+               mutex_init(&dev->mutex);
                INIT_LIST_HEAD(&dev->h_list);
                INIT_LIST_HEAD(&dev->node);
        }
@@ -716,6 +892,18 @@ struct input_dev *input_allocate_device(void)
        return dev;
 }
 
+void input_free_device(struct input_dev *dev)
+{
+       if (dev) {
+
+               mutex_lock(&dev->mutex);
+               dev->name = dev->phys = dev->uniq = NULL;
+               mutex_unlock(&dev->mutex);
+
+               input_put_device(dev);
+       }
+}
+
 int input_register_device(struct input_dev *dev)
 {
        static atomic_t input_no = ATOMIC_INIT(0);
@@ -732,7 +920,6 @@ int input_register_device(struct input_dev *dev)
                return -EINVAL;
        }
 
-       init_MUTEX(&dev->sem);
        set_bit(EV_SYN, dev->evbit);
 
        /*
@@ -796,9 +983,10 @@ int input_register_device(struct input_dev *dev)
 
 void input_unregister_device(struct input_dev *dev)
 {
-       struct list_head * node, * next;
+       struct list_head *node, *next;
 
-       if (!dev) return;
+       if (!dev)
+               return;
 
        del_timer_sync(&dev->timer);
 
@@ -816,6 +1004,10 @@ void input_unregister_device(struct input_dev *dev)
        sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
        class_device_unregister(&dev->cdev);
 
+       mutex_lock(&dev->mutex);
+       dev->name = dev->phys = dev->uniq = NULL;
+       mutex_unlock(&dev->mutex);
+
        input_wakeup_procfs_readers();
 }
 
@@ -825,7 +1017,8 @@ void input_register_handler(struct input_handler *handler)
        struct input_handle *handle;
        struct input_device_id *id;
 
-       if (!handler) return;
+       if (!handler)
+               return;
 
        INIT_LIST_HEAD(&handler->h_list);
 
@@ -845,7 +1038,7 @@ void input_register_handler(struct input_handler *handler)
 
 void input_unregister_handler(struct input_handler *handler)
 {
-       struct list_head * node, * next;
+       struct list_head *node, *next;
 
        list_for_each_safe(node, next, &handler->h_list) {
                struct input_handle * handle = to_handle_h(node);
@@ -865,7 +1058,7 @@ void input_unregister_handler(struct input_handler *handler)
 static int input_open_file(struct inode *inode, struct file *file)
 {
        struct input_handler *handler = input_table[iminor(inode) >> 5];
-       struct file_operations *old_fops, *new_fops = NULL;
+       const struct file_operations *old_fops, *new_fops = NULL;
        int err;
 
        /* No load-on-demand here? */