Input: fix formatting to better follow CodingStyle
[linux-2.6.git] / drivers / input / input.c
index 7c4b4d3..7570a3f 100644 (file)
 #include <linux/random.h>
 #include <linux/major.h>
 #include <linux/proc_fs.h>
-#include <linux/kobject_uevent.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/device.h>
-#include <linux/devfs_fs_kernel.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);
@@ -39,7 +41,7 @@ EXPORT_SYMBOL(input_close_device);
 EXPORT_SYMBOL(input_accept_process);
 EXPORT_SYMBOL(input_flush_device);
 EXPORT_SYMBOL(input_event);
-EXPORT_SYMBOL(input_class);
+EXPORT_SYMBOL_GPL(input_class);
 
 #define INPUT_DEVICES  256
 
@@ -48,12 +50,6 @@ static LIST_HEAD(input_handler_list);
 
 static struct input_handler *input_table[8];
 
-#ifdef CONFIG_PROC_FS
-static struct proc_dir_entry *proc_bus_input_dir;
-static DECLARE_WAIT_QUEUE_HEAD(input_devices_poll_wait);
-static int input_devices_state;
-#endif
-
 void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
        struct input_handle *handle;
@@ -68,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;
                        }
@@ -95,6 +93,15 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
 
                        break;
 
+               case EV_SW:
+
+                       if (code > SW_MAX || !test_bit(code, dev->swbit) || !!test_bit(code, dev->sw) == value)
+                               return;
+
+                       change_bit(code, dev->sw);
+
+                       break;
+
                case EV_ABS:
 
                        if (code > ABS_MAX || !test_bit(code, dev->absbit))
@@ -132,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;
 
@@ -142,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;
 
@@ -151,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;
        }
 
@@ -222,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;
 
@@ -234,7 +251,7 @@ int input_open_device(struct input_handle *handle)
        if (err)
                handle->open--;
 
-       up(&dev->sem);
+       mutex_unlock(&dev->mutex);
 
        return err;
 }
@@ -253,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)
@@ -282,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);
@@ -305,6 +322,7 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
                MATCH_BIT(ledbit, LED_MAX);
                MATCH_BIT(sndbit, SND_MAX);
                MATCH_BIT(ffbit,  FF_MAX);
+               MATCH_BIT(swbit,  SW_MAX);
 
                return id;
        }
@@ -312,132 +330,598 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
        return NULL;
 }
 
+#ifdef CONFIG_PROC_FS
+
+static struct proc_dir_entry *proc_bus_input_dir;
+static DECLARE_WAIT_QUEUE_HEAD(input_devices_poll_wait);
+static int input_devices_state;
+
+static inline void input_wakeup_procfs_readers(void)
+{
+       input_devices_state++;
+       wake_up(&input_devices_poll_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;
+}
+
+static struct list_head *list_get_nth_element(struct list_head *list, loff_t *pos)
+{
+       struct list_head *node;
+       loff_t i = 0;
+
+       list_for_each(node, list)
+               if (i++ == *pos)
+                       return node;
+
+       return NULL;
+}
+
+static struct list_head *list_get_next_element(struct list_head *list, struct list_head *element, loff_t *pos)
+{
+       if (element->next == list)
+               return NULL;
+
+       ++(*pos);
+       return element->next;
+}
+
+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... */
+
+       return list_get_nth_element(&input_dev_list, pos);
+}
+
+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);
+}
+
+static void input_devices_seq_stop(struct seq_file *seq, void *v)
+{
+       /* release lock here */
+}
+
+static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
+                                  unsigned long *bitmap, int max)
+{
+       int i;
+
+       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);
+
+       seq_putc(seq, '\n');
+
+       kfree(path);
+       return 0;
+}
+
+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)
+{
+       return seq_open(file, &input_devices_seq_ops);
+}
+
+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);
+}
+
+static void input_handlers_seq_stop(struct seq_file *seq, void *v)
+{
+       /* release lock here */
+}
+
+static int input_handlers_seq_show(struct seq_file *seq, void *v)
+{
+       struct input_handler *handler = container_of(v, struct input_handler, node);
+
+       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');
+
+       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,
+};
+
+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_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)
+{
+       struct proc_dir_entry *entry;
+
+       proc_bus_input_dir = proc_mkdir("input", proc_bus);
+       if (!proc_bus_input_dir)
+               return -ENOMEM;
+
+       proc_bus_input_dir->owner = THIS_MODULE;
+
+       entry = create_proc_entry("devices", 0, proc_bus_input_dir);
+       if (!entry)
+               goto fail1;
+
+       entry->owner = THIS_MODULE;
+       entry->proc_fops = &input_devices_fileops;
+
+       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;
+
+ fail2:        remove_proc_entry("devices", proc_bus_input_dir);
+ fail1: remove_proc_entry("input", proc_bus);
+       return -ENOMEM;
+}
+
+static void input_proc_exit(void)
+{
+       remove_proc_entry("devices", proc_bus_input_dir);
+       remove_proc_entry("handlers", proc_bus_input_dir);
+       remove_proc_entry("input", proc_bus);
+}
+
+#else /* !CONFIG_PROC_FS */
+static inline void input_wakeup_procfs_readers(void) { }
+static inline int input_proc_init(void) { return 0; }
+static inline void input_proc_exit(void) { }
+#endif
+
+#define INPUT_DEV_STRING_ATTR_SHOW(name)                                       \
+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;                                                          \
+}                                                                              \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_##name, NULL);
+
+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
+};
+
+static struct attribute_group input_dev_attr_group = {
+       .attrs  = input_dev_attrs,
+};
+
+#define INPUT_DEV_ID_ATTR(name)                                                        \
+static ssize_t input_dev_show_id_##name(struct class_device *dev, char *buf)   \
+{                                                                              \
+       struct input_dev *input_dev = to_input_dev(dev);                        \
+       return scnprintf(buf, PAGE_SIZE, "%04x\n", input_dev->id.name);         \
+}                                                                              \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_id_##name, NULL);
+
+INPUT_DEV_ID_ATTR(bustype);
+INPUT_DEV_ID_ATTR(vendor);
+INPUT_DEV_ID_ATTR(product);
+INPUT_DEV_ID_ATTR(version);
+
+static struct attribute *input_dev_id_attrs[] = {
+       &class_device_attr_bustype.attr,
+       &class_device_attr_vendor.attr,
+       &class_device_attr_product.attr,
+       &class_device_attr_version.attr,
+       NULL
+};
+
+static struct attribute_group input_dev_id_attr_group = {
+       .name   = "id",
+       .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);                        \
+       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);
+
+INPUT_DEV_CAP_ATTR(EV, ev);
+INPUT_DEV_CAP_ATTR(KEY, key);
+INPUT_DEV_CAP_ATTR(REL, rel);
+INPUT_DEV_CAP_ATTR(ABS, abs);
+INPUT_DEV_CAP_ATTR(MSC, msc);
+INPUT_DEV_CAP_ATTR(LED, led);
+INPUT_DEV_CAP_ATTR(SND, snd);
+INPUT_DEV_CAP_ATTR(FF, ff);
+INPUT_DEV_CAP_ATTR(SW, sw);
+
+static struct attribute *input_dev_caps_attrs[] = {
+       &class_device_attr_ev.attr,
+       &class_device_attr_key.attr,
+       &class_device_attr_rel.attr,
+       &class_device_attr_abs.attr,
+       &class_device_attr_msc.attr,
+       &class_device_attr_led.attr,
+       &class_device_attr_snd.attr,
+       &class_device_attr_ff.attr,
+       &class_device_attr_sw.attr,
+       NULL
+};
+
+static struct attribute_group input_dev_caps_attr_group = {
+       .name   = "capabilities",
+       .attrs  = input_dev_caps_attrs,
+};
+
+static void input_dev_release(struct class_device *class_dev)
+{
+       struct input_dev *dev = to_input_dev(class_dev);
+
+       kfree(dev);
+       module_put(THIS_MODULE);
+}
+
 /*
- * Input hotplugging interface - loading event handlers based on
+ * Input uevent interface - loading event handlers based on
  * device bitfields.
  */
+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;
 
-#ifdef CONFIG_HOTPLUG
+       envp[*cur_index] = buffer + *cur_len;
 
-/*
- * Input hotplugging invokes what /proc/sys/kernel/hotplug says
- * (normally /sbin/hotplug) when input devices get added or removed.
- *
- * This invokes a user mode policy agent, typically helping to load driver
- * or other modules, configure the device, and more.  Drivers can provide
- * a MODULE_DEVICE_TABLE to help with module loading subtasks.
- *
- */
+       *cur_len += snprintf(buffer + *cur_len, max(buffer_size - *cur_len, 0), name);
+       if (*cur_len >= buffer_size)
+               return -ENOMEM;
 
-#define SPRINTF_BIT_A(bit, name, max) \
-       do { \
-               envp[i++] = scratch; \
-               scratch += sprintf(scratch, name); \
-               for (j = NBITS(max) - 1; j >= 0; j--) \
-                       if (dev->bit[j]) break; \
-               for (; j >= 0; j--) \
-                       scratch += sprintf(scratch, "%lx ", dev->bit[j]); \
-               scratch++; \
-       } while (0)
+       *cur_len += input_print_bitmap(buffer + *cur_len,
+                                       max(buffer_size - *cur_len, 0),
+                                       bitmap, max, 0) + 1;
+       if (*cur_len > buffer_size)
+               return -ENOMEM;
 
-#define SPRINTF_BIT_A2(bit, name, max, ev) \
-       do { \
-               if (test_bit(ev, dev->evbit)) \
-                       SPRINTF_BIT_A(bit, name, max); \
-       } while (0)
+       (*cur_index)++;
+       return 0;
+}
 
-static void input_call_hotplug(char *verb, struct input_dev *dev)
+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)
 {
-       char *argv[3], **envp, *buf, *scratch;
-       int i = 0, j, value;
+       if (*cur_index >= num_envp - 1)
+               return -ENOMEM;
 
-       if (!hotplug_path[0]) {
-               printk(KERN_ERR "input.c: calling hotplug without a hotplug agent defined\n");
-               return;
-       }
-       if (in_interrupt()) {
-               printk(KERN_ERR "input.c: calling hotplug from interrupt\n");
-               return;
-       }
-       if (!current->fs->root) {
-               printk(KERN_WARNING "input.c: calling hotplug without valid filesystem\n");
-               return;
-       }
-       if (!(envp = (char **) kmalloc(20 * sizeof(char *), GFP_KERNEL))) {
-               printk(KERN_ERR "input.c: not enough memory allocating hotplug environment\n");
-               return;
-       }
-       if (!(buf = kmalloc(1024, GFP_KERNEL))) {
-               kfree (envp);
-               printk(KERN_ERR "input.c: not enough memory allocating hotplug environment\n");
-               return;
-       }
+       envp[*cur_index] = buffer + *cur_len;
 
-       argv[0] = hotplug_path;
-       argv[1] = "input";
-       argv[2] = NULL;
+       *cur_len += snprintf(buffer + *cur_len, max(buffer_size - *cur_len, 0),
+                            "MODALIAS=");
+       if (*cur_len >= buffer_size)
+               return -ENOMEM;
 
-       envp[i++] = "HOME=/";
-       envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
+       *cur_len += input_print_modalias(buffer + *cur_len,
+                                        max(buffer_size - *cur_len, 0),
+                                        dev, 0) + 1;
+       if (*cur_len > buffer_size)
+               return -ENOMEM;
+
+       (*cur_index)++;
+       return 0;
+}
 
-       scratch = buf;
+#define INPUT_ADD_HOTPLUG_VAR(fmt, val...)                             \
+       do {                                                            \
+               int err = add_uevent_var(envp, num_envp, &i,            \
+                                       buffer, buffer_size, &len,      \
+                                       fmt, val);                      \
+               if (err)                                                \
+                       return err;                                     \
+       } while (0)
 
-       envp[i++] = scratch;
-       scratch += sprintf(scratch, "ACTION=%s", verb) + 1;
+#define INPUT_ADD_HOTPLUG_BM_VAR(name, bm, max)                                \
+       do {                                                            \
+               int err = input_add_uevent_bm_var(envp, num_envp, &i,   \
+                                       buffer, buffer_size, &len,      \
+                                       name, bm, max);                 \
+               if (err)                                                \
+                       return err;                                     \
+       } while (0)
 
-       envp[i++] = scratch;
-       scratch += sprintf(scratch, "PRODUCT=%x/%x/%x/%x",
-               dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version) + 1;
+#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)
 
-       if (dev->name) {
-               envp[i++] = scratch;
-               scratch += sprintf(scratch, "NAME=%s", dev->name) + 1;
-       }
+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;
+       int len = 0;
+
+       INPUT_ADD_HOTPLUG_VAR("PRODUCT=%x/%x/%x/%x",
+                               dev->id.bustype, dev->id.vendor,
+                               dev->id.product, dev->id.version);
+       if (dev->name)
+               INPUT_ADD_HOTPLUG_VAR("NAME=\"%s\"", dev->name);
+       if (dev->phys)
+               INPUT_ADD_HOTPLUG_VAR("PHYS=\"%s\"", dev->phys);
+       if (dev->uniq)
+               INPUT_ADD_HOTPLUG_VAR("UNIQ=\"%s\"", dev->uniq);
+
+       INPUT_ADD_HOTPLUG_BM_VAR("EV=", dev->evbit, EV_MAX);
+       if (test_bit(EV_KEY, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("KEY=", dev->keybit, KEY_MAX);
+       if (test_bit(EV_REL, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("REL=", dev->relbit, REL_MAX);
+       if (test_bit(EV_ABS, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("ABS=", dev->absbit, ABS_MAX);
+       if (test_bit(EV_MSC, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("MSC=", dev->mscbit, MSC_MAX);
+       if (test_bit(EV_LED, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("LED=", dev->ledbit, LED_MAX);
+       if (test_bit(EV_SND, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("SND=", dev->sndbit, SND_MAX);
+       if (test_bit(EV_FF, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("FF=", dev->ffbit, FF_MAX);
+       if (test_bit(EV_SW, dev->evbit))
+               INPUT_ADD_HOTPLUG_BM_VAR("SW=", dev->swbit, SW_MAX);
+
+       INPUT_ADD_HOTPLUG_MODALIAS_VAR(dev);
+
+       envp[i] = NULL;
+       return 0;
+}
 
-       if (dev->phys) {
-               envp[i++] = scratch;
-               scratch += sprintf(scratch, "PHYS=%s", dev->phys) + 1;
-       }
+struct class input_class = {
+       .name                   = "input",
+       .release                = input_dev_release,
+       .uevent                 = input_dev_uevent,
+};
 
-       SPRINTF_BIT_A(evbit, "EV=", EV_MAX);
-       SPRINTF_BIT_A2(keybit, "KEY=", KEY_MAX, EV_KEY);
-       SPRINTF_BIT_A2(relbit, "REL=", REL_MAX, EV_REL);
-       SPRINTF_BIT_A2(absbit, "ABS=", ABS_MAX, EV_ABS);
-       SPRINTF_BIT_A2(mscbit, "MSC=", MSC_MAX, EV_MSC);
-       SPRINTF_BIT_A2(ledbit, "LED=", LED_MAX, EV_LED);
-       SPRINTF_BIT_A2(sndbit, "SND=", SND_MAX, EV_SND);
-       SPRINTF_BIT_A2(ffbit,  "FF=",  FF_MAX, EV_FF);
+struct input_dev *input_allocate_device(void)
+{
+       struct input_dev *dev;
 
-       envp[i++] = NULL;
+       dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
+       if (dev) {
+               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);
+       }
 
-#ifdef INPUT_DEBUG
-       printk(KERN_DEBUG "input.c: calling %s %s [%s %s %s %s %s]\n",
-               argv[0], argv[1], envp[0], envp[1], envp[2], envp[3], envp[4]);
-#endif
+       return dev;
+}
 
-       value = call_usermodehelper(argv [0], argv, envp, 0);
+void input_free_device(struct input_dev *dev)
+{
+       if (dev) {
 
-       kfree(buf);
-       kfree(envp);
+               mutex_lock(&dev->mutex);
+               dev->name = dev->phys = dev->uniq = NULL;
+               mutex_unlock(&dev->mutex);
 
-#ifdef INPUT_DEBUG
-       if (value != 0)
-               printk(KERN_DEBUG "input.c: hotplug returned %d\n", value);
-#endif
+               input_put_device(dev);
+       }
 }
 
-#endif
-
-void input_register_device(struct input_dev *dev)
+int input_register_device(struct input_dev *dev)
 {
+       static atomic_t input_no = ATOMIC_INIT(0);
        struct input_handle *handle;
        struct input_handler *handler;
        struct input_device_id *id;
+       const char *path;
+       int error;
+
+       if (!dev->dynalloc) {
+               printk(KERN_WARNING "input: device %s is statically allocated, will not register\n"
+                       "Please convert to input_allocate_device() or contact dtor_core@ameritech.net\n",
+                       dev->name ? dev->name : "<Unknown>");
+               return -EINVAL;
+       }
 
        set_bit(EV_SYN, dev->evbit);
 
-       init_MUTEX(&dev->sem);
-
        /*
         * If delay and period are pre-set by the driver, then autorepeating
         * is handled by the driver itself and we don't do it in input.c.
@@ -454,27 +938,55 @@ void input_register_device(struct input_dev *dev)
        INIT_LIST_HEAD(&dev->h_list);
        list_add_tail(&dev->node, &input_dev_list);
 
+       dev->cdev.class = &input_class;
+       snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),
+                "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
+
+       error = class_device_add(&dev->cdev);
+       if (error)
+               return error;
+
+       error = sysfs_create_group(&dev->cdev.kobj, &input_dev_attr_group);
+       if (error)
+               goto fail1;
+
+       error = sysfs_create_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+       if (error)
+               goto fail2;
+
+       error = sysfs_create_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
+       if (error)
+               goto fail3;
+
+       __module_get(THIS_MODULE);
+
+       path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
+       printk(KERN_INFO "input: %s as %s\n",
+               dev->name ? dev->name : "Unspecified device", path ? path : "N/A");
+       kfree(path);
+
        list_for_each_entry(handler, &input_handler_list, node)
                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
                        if ((id = input_match_device(handler->id_table, dev)))
                                if ((handle = handler->connect(handler, dev, id)))
                                        input_link_handle(handle);
 
-#ifdef CONFIG_HOTPLUG
-       input_call_hotplug("add", dev);
-#endif
+       input_wakeup_procfs_readers();
 
-#ifdef CONFIG_PROC_FS
-       input_devices_state++;
-       wake_up(&input_devices_poll_wait);
-#endif
+       return 0;
+
+ fail3:        sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+ fail2:        sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
+ fail1:        class_device_del(&dev->cdev);
+       return error;
 }
 
 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);
 
@@ -485,16 +997,18 @@ void input_unregister_device(struct input_dev *dev)
                handle->handler->disconnect(handle);
        }
 
-#ifdef CONFIG_HOTPLUG
-       input_call_hotplug("remove", dev);
-#endif
-
        list_del_init(&dev->node);
 
-#ifdef CONFIG_PROC_FS
-       input_devices_state++;
-       wake_up(&input_devices_poll_wait);
-#endif
+       sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
+       sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+       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();
 }
 
 void input_register_handler(struct input_handler *handler)
@@ -503,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);
 
@@ -518,15 +1033,12 @@ void input_register_handler(struct input_handler *handler)
                                if ((handle = handler->connect(handler, dev, id)))
                                        input_link_handle(handle);
 
-#ifdef CONFIG_PROC_FS
-       input_devices_state++;
-       wake_up(&input_devices_poll_wait);
-#endif
+       input_wakeup_procfs_readers();
 }
 
 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);
@@ -540,16 +1052,13 @@ void input_unregister_handler(struct input_handler *handler)
        if (handler->fops != NULL)
                input_table[handler->minor >> 5] = NULL;
 
-#ifdef CONFIG_PROC_FS
-       input_devices_state++;
-       wake_up(&input_devices_poll_wait);
-#endif
+       input_wakeup_procfs_readers();
 }
 
 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? */
@@ -582,193 +1091,38 @@ static struct file_operations input_fops = {
        .open = input_open_file,
 };
 
-#ifdef CONFIG_PROC_FS
-
-#define SPRINTF_BIT_B(bit, name, max) \
-       do { \
-               len += sprintf(buf + len, "B: %s", name); \
-               for (i = NBITS(max) - 1; i >= 0; i--) \
-                       if (dev->bit[i]) break; \
-               for (; i >= 0; i--) \
-                       len += sprintf(buf + len, "%lx ", dev->bit[i]); \
-               len += sprintf(buf + len, "\n"); \
-       } while (0)
-
-#define SPRINTF_BIT_B2(bit, name, max, ev) \
-       do { \
-               if (test_bit(ev, dev->evbit)) \
-                       SPRINTF_BIT_B(bit, name, max); \
-       } while (0)
-
-
-static unsigned int input_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;
-}
-
-static int input_devices_read(char *buf, char **start, off_t pos, int count, int *eof, void *data)
+static int __init input_init(void)
 {
-       struct input_dev *dev;
-       struct input_handle *handle;
-
-       off_t at = 0;
-       int i, len, cnt = 0;
-
-       list_for_each_entry(dev, &input_dev_list, node) {
-
-               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);
-
-               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, "H: Handlers=");
+       int err;
 
-               list_for_each_entry(handle, &dev->h_list, d_node)
-                       len += sprintf(buf + len, "%s ", handle->name);
-
-               len += sprintf(buf + len, "\n");
-
-               SPRINTF_BIT_B(evbit, "EV=", EV_MAX);
-               SPRINTF_BIT_B2(keybit, "KEY=", KEY_MAX, EV_KEY);
-               SPRINTF_BIT_B2(relbit, "REL=", REL_MAX, EV_REL);
-               SPRINTF_BIT_B2(absbit, "ABS=", ABS_MAX, EV_ABS);
-               SPRINTF_BIT_B2(mscbit, "MSC=", MSC_MAX, EV_MSC);
-               SPRINTF_BIT_B2(ledbit, "LED=", LED_MAX, EV_LED);
-               SPRINTF_BIT_B2(sndbit, "SND=", SND_MAX, EV_SND);
-               SPRINTF_BIT_B2(ffbit,  "FF=",  FF_MAX, EV_FF);
-
-               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;
-               }
+       err = class_register(&input_class);
+       if (err) {
+               printk(KERN_ERR "input: unable to register input_dev class\n");
+               return err;
        }
 
-       if (&dev->node == &input_dev_list)
-               *eof = 1;
-
-       return (count > cnt) ? cnt : count;
-}
-
-static int input_handlers_read(char *buf, char **start, off_t pos, int count, int *eof, void *data)
-{
-       struct input_handler *handler;
-
-       off_t at = 0;
-       int len = 0, cnt = 0;
-       int i = 0;
-
-       list_for_each_entry(handler, &input_handler_list, node) {
-
-               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);
-
-               at += len;
+       err = input_proc_init();
+       if (err)
+               goto fail1;
 
-               if (at >= pos) {
-                       if (!*start) {
-                               *start = buf + (pos - (at - len));
-                               cnt = at - pos;
-                       } else  cnt += len;
-                       buf += len;
-                       if (cnt >= count)
-                               break;
-               }
+       err = register_chrdev(INPUT_MAJOR, "input", &input_fops);
+       if (err) {
+               printk(KERN_ERR "input: unable to register char major %d", INPUT_MAJOR);
+               goto fail2;
        }
-       if (&handler->node == &input_handler_list)
-               *eof = 1;
-
-       return (count > cnt) ? cnt : count;
-}
-
-static struct file_operations input_fileops;
-
-static int __init input_proc_init(void)
-{
-       struct proc_dir_entry *entry;
 
-       proc_bus_input_dir = proc_mkdir("input", proc_bus);
-       if (proc_bus_input_dir == NULL)
-               return -ENOMEM;
-       proc_bus_input_dir->owner = THIS_MODULE;
-       entry = create_proc_read_entry("devices", 0, proc_bus_input_dir, input_devices_read, NULL);
-       if (entry == NULL) {
-               remove_proc_entry("input", proc_bus);
-               return -ENOMEM;
-       }
-       entry->owner = THIS_MODULE;
-       input_fileops = *entry->proc_fops;
-       entry->proc_fops = &input_fileops;
-       entry->proc_fops->poll = input_devices_poll;
-       entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);
-       if (entry == NULL) {
-               remove_proc_entry("devices", proc_bus_input_dir);
-               remove_proc_entry("input", proc_bus);
-               return -ENOMEM;
-       }
-       entry->owner = THIS_MODULE;
        return 0;
-}
-#else /* !CONFIG_PROC_FS */
-static inline int input_proc_init(void) { return 0; }
-#endif
-
-struct class *input_class;
-
-static int __init input_init(void)
-{
-       int retval = -ENOMEM;
 
-       input_class = class_create(THIS_MODULE, "input");
-       if (IS_ERR(input_class))
-               return PTR_ERR(input_class);
-       input_proc_init();
-       retval = register_chrdev(INPUT_MAJOR, "input", &input_fops);
-       if (retval) {
-               printk(KERN_ERR "input: unable to register char major %d", INPUT_MAJOR);
-               remove_proc_entry("devices", proc_bus_input_dir);
-               remove_proc_entry("handlers", proc_bus_input_dir);
-               remove_proc_entry("input", proc_bus);
-               class_destroy(input_class);
-               return retval;
-       }
-
-       retval = devfs_mk_dir("input");
-       if (retval) {
-               remove_proc_entry("devices", proc_bus_input_dir);
-               remove_proc_entry("handlers", proc_bus_input_dir);
-               remove_proc_entry("input", proc_bus);
-               unregister_chrdev(INPUT_MAJOR, "input");
-               class_destroy(input_class);
-       }
-       return retval;
+ fail2:        input_proc_exit();
+ fail1:        class_unregister(&input_class);
+       return err;
 }
 
 static void __exit input_exit(void)
 {
-       remove_proc_entry("devices", proc_bus_input_dir);
-       remove_proc_entry("handlers", proc_bus_input_dir);
-       remove_proc_entry("input", proc_bus);
-
-       devfs_remove("input");
+       input_proc_exit();
        unregister_chrdev(INPUT_MAJOR, "input");
-       class_destroy(input_class);
+       class_unregister(&input_class);
 }
 
 subsys_initcall(input_init);