headers: remove sched.h from poll.h
[safe/jmp/linux-2.6] / drivers / input / mousedev.c
index 81fd7a9..a13d80f 100644 (file)
 #define MOUSEDEV_MINORS                32
 #define MOUSEDEV_MIX           31
 
+#include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/input.h>
-#include <linux/config.h>
-#include <linux/smp_lock.h>
 #include <linux/random.h>
 #include <linux/major.h>
 #include <linux/device.h>
@@ -62,10 +61,15 @@ struct mousedev {
        int exist;
        int open;
        int minor;
-       char name[16];
-       wait_queue_head_t wait;
-       struct list_head list;
        struct input_handle handle;
+       wait_queue_head_t wait;
+       struct list_head client_list;
+       spinlock_t client_lock; /* protects client_list */
+       struct mutex mutex;
+       struct device dev;
+
+       struct list_head mixdev_node;
+       int mixdev_open;
 
        struct mousedev_hw_data packet;
        unsigned int pkt_count;
@@ -86,7 +90,7 @@ struct mousedev_motion {
 };
 
 #define PACKET_QUEUE_LEN       16
-struct mousedev_list {
+struct mousedev_client {
        struct fasync_struct *fasync;
        struct mousedev *mousedev;
        struct list_head node;
@@ -111,155 +115,202 @@ static unsigned char mousedev_imex_seq[] = { 0xf3, 200, 0xf3, 200, 0xf3, 80 };
 static struct input_handler mousedev_handler;
 
 static struct mousedev *mousedev_table[MOUSEDEV_MINORS];
-static struct mousedev mousedev_mix;
+static DEFINE_MUTEX(mousedev_table_mutex);
+static struct mousedev *mousedev_mix;
+static LIST_HEAD(mousedev_mix_list);
+
+static void mixdev_open_devices(void);
+static void mixdev_close_devices(void);
 
 #define fx(i)  (mousedev->old_x[(mousedev->pkt_count - (i)) & 03])
 #define fy(i)  (mousedev->old_y[(mousedev->pkt_count - (i)) & 03])
 
-static void mousedev_touchpad_event(struct input_dev *dev, struct mousedev *mousedev, unsigned int code, int value)
+static void mousedev_touchpad_event(struct input_dev *dev,
+                                   struct mousedev *mousedev,
+                                   unsigned int code, int value)
 {
        int size, tmp;
        enum { FRACTION_DENOM = 128 };
 
-       if (mousedev->touch) {
-               size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
-               if (size == 0) size = 256 * 2;
-               switch (code) {
-                       case ABS_X:
-                               fx(0) = value;
-                               if (mousedev->pkt_count >= 2) {
-                                       tmp = ((value - fx(2)) * (256 * FRACTION_DENOM)) / size;
-                                       tmp += mousedev->frac_dx;
-                                       mousedev->packet.dx = tmp / FRACTION_DENOM;
-                                       mousedev->frac_dx = tmp - mousedev->packet.dx * FRACTION_DENOM;
-                               }
-                               break;
-
-                       case ABS_Y:
-                               fy(0) = value;
-                               if (mousedev->pkt_count >= 2) {
-                                       tmp = -((value - fy(2)) * (256 * FRACTION_DENOM)) / size;
-                                       tmp += mousedev->frac_dy;
-                                       mousedev->packet.dy = tmp / FRACTION_DENOM;
-                                       mousedev->frac_dy = tmp - mousedev->packet.dy * FRACTION_DENOM;
-                               }
-                               break;
+       switch (code) {
+
+       case ABS_X:
+               fx(0) = value;
+               if (mousedev->touch && mousedev->pkt_count >= 2) {
+                       size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
+                       if (size == 0)
+                               size = 256 * 2;
+                       tmp = ((value - fx(2)) * 256 * FRACTION_DENOM) / size;
+                       tmp += mousedev->frac_dx;
+                       mousedev->packet.dx = tmp / FRACTION_DENOM;
+                       mousedev->frac_dx =
+                               tmp - mousedev->packet.dx * FRACTION_DENOM;
+               }
+               break;
+
+       case ABS_Y:
+               fy(0) = value;
+               if (mousedev->touch && mousedev->pkt_count >= 2) {
+                       /* use X size to keep the same scale */
+                       size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
+                       if (size == 0)
+                               size = 256 * 2;
+                       tmp = -((value - fy(2)) * 256 * FRACTION_DENOM) / size;
+                       tmp += mousedev->frac_dy;
+                       mousedev->packet.dy = tmp / FRACTION_DENOM;
+                       mousedev->frac_dy = tmp -
+                               mousedev->packet.dy * FRACTION_DENOM;
                }
+               break;
        }
 }
 
-static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev, unsigned int code, int value)
+static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,
+                               unsigned int code, int value)
 {
        int size;
 
        switch (code) {
-               case ABS_X:
-                       size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
-                       if (size == 0) size = xres ? : 1;
-                       if (value > dev->absmax[ABS_X]) value = dev->absmax[ABS_X];
-                       if (value < dev->absmin[ABS_X]) value = dev->absmin[ABS_X];
-                       mousedev->packet.x = ((value - dev->absmin[ABS_X]) * xres) / size;
-                       mousedev->packet.abs_event = 1;
-                       break;
 
-               case ABS_Y:
-                       size = dev->absmax[ABS_Y] - dev->absmin[ABS_Y];
-                       if (size == 0) size = yres ? : 1;
-                       if (value > dev->absmax[ABS_Y]) value = dev->absmax[ABS_Y];
-                       if (value < dev->absmin[ABS_Y]) value = dev->absmin[ABS_Y];
-                       mousedev->packet.y = yres - ((value - dev->absmin[ABS_Y]) * yres) / size;
-                       mousedev->packet.abs_event = 1;
-                       break;
+       case ABS_X:
+               size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
+               if (size == 0)
+                       size = xres ? : 1;
+               if (value > dev->absmax[ABS_X])
+                       value = dev->absmax[ABS_X];
+               if (value < dev->absmin[ABS_X])
+                       value = dev->absmin[ABS_X];
+               mousedev->packet.x =
+                       ((value - dev->absmin[ABS_X]) * xres) / size;
+               mousedev->packet.abs_event = 1;
+               break;
+
+       case ABS_Y:
+               size = dev->absmax[ABS_Y] - dev->absmin[ABS_Y];
+               if (size == 0)
+                       size = yres ? : 1;
+               if (value > dev->absmax[ABS_Y])
+                       value = dev->absmax[ABS_Y];
+               if (value < dev->absmin[ABS_Y])
+                       value = dev->absmin[ABS_Y];
+               mousedev->packet.y = yres -
+                       ((value - dev->absmin[ABS_Y]) * yres) / size;
+               mousedev->packet.abs_event = 1;
+               break;
        }
 }
 
-static void mousedev_rel_event(struct mousedev *mousedev, unsigned int code, int value)
+static void mousedev_rel_event(struct mousedev *mousedev,
+                               unsigned int code, int value)
 {
        switch (code) {
-               case REL_X:     mousedev->packet.dx += value; break;
-               case REL_Y:     mousedev->packet.dy -= value; break;
-               case REL_WHEEL: mousedev->packet.dz -= value; break;
+       case REL_X:
+               mousedev->packet.dx += value;
+               break;
+
+       case REL_Y:
+               mousedev->packet.dy -= value;
+               break;
+
+       case REL_WHEEL:
+               mousedev->packet.dz -= value;
+               break;
        }
 }
 
-static void mousedev_key_event(struct mousedev *mousedev, unsigned int code, int value)
+static void mousedev_key_event(struct mousedev *mousedev,
+                               unsigned int code, int value)
 {
        int index;
 
        switch (code) {
-               case BTN_TOUCH:
-               case BTN_0:
-               case BTN_FORWARD:
-               case BTN_LEFT:          index = 0; break;
-               case BTN_STYLUS:
-               case BTN_1:
-               case BTN_RIGHT:         index = 1; break;
-               case BTN_2:
-               case BTN_STYLUS2:
-               case BTN_MIDDLE:        index = 2; break;
-               case BTN_3:
-               case BTN_BACK:
-               case BTN_SIDE:          index = 3; break;
-               case BTN_4:
-               case BTN_EXTRA:         index = 4; break;
-               default:                return;
+
+       case BTN_TOUCH:
+       case BTN_0:
+       case BTN_LEFT:          index = 0; break;
+
+       case BTN_STYLUS:
+       case BTN_1:
+       case BTN_RIGHT:         index = 1; break;
+
+       case BTN_2:
+       case BTN_FORWARD:
+       case BTN_STYLUS2:
+       case BTN_MIDDLE:        index = 2; break;
+
+       case BTN_3:
+       case BTN_BACK:
+       case BTN_SIDE:          index = 3; break;
+
+       case BTN_4:
+       case BTN_EXTRA:         index = 4; break;
+
+       default:                return;
        }
 
        if (value) {
                set_bit(index, &mousedev->packet.buttons);
-               set_bit(index, &mousedev_mix.packet.buttons);
+               set_bit(index, &mousedev_mix->packet.buttons);
        } else {
                clear_bit(index, &mousedev->packet.buttons);
-               clear_bit(index, &mousedev_mix.packet.buttons);
+               clear_bit(index, &mousedev_mix->packet.buttons);
        }
 }
 
-static void mousedev_notify_readers(struct mousedev *mousedev, struct mousedev_hw_data *packet)
+static void mousedev_notify_readers(struct mousedev *mousedev,
+                                   struct mousedev_hw_data *packet)
 {
-       struct mousedev_list *list;
+       struct mousedev_client *client;
        struct mousedev_motion *p;
-       unsigned long flags;
+       unsigned int new_head;
        int wake_readers = 0;
 
-       list_for_each_entry(list, &mousedev->list, node) {
-               spin_lock_irqsave(&list->packet_lock, flags);
+       rcu_read_lock();
+       list_for_each_entry_rcu(client, &mousedev->client_list, node) {
+
+               /* Just acquire the lock, interrupts already disabled */
+               spin_lock(&client->packet_lock);
 
-               p = &list->packets[list->head];
-               if (list->ready && p->buttons != mousedev->packet.buttons) {
-                       unsigned int new_head = (list->head + 1) % PACKET_QUEUE_LEN;
-                       if (new_head != list->tail) {
-                               p = &list->packets[list->head = new_head];
+               p = &client->packets[client->head];
+               if (client->ready && p->buttons != mousedev->packet.buttons) {
+                       new_head = (client->head + 1) % PACKET_QUEUE_LEN;
+                       if (new_head != client->tail) {
+                               p = &client->packets[client->head = new_head];
                                memset(p, 0, sizeof(struct mousedev_motion));
                        }
                }
 
                if (packet->abs_event) {
-                       p->dx += packet->x - list->pos_x;
-                       p->dy += packet->y - list->pos_y;
-                       list->pos_x = packet->x;
-                       list->pos_y = packet->y;
+                       p->dx += packet->x - client->pos_x;
+                       p->dy += packet->y - client->pos_y;
+                       client->pos_x = packet->x;
+                       client->pos_y = packet->y;
                }
 
-               list->pos_x += packet->dx;
-               list->pos_x = list->pos_x < 0 ? 0 : (list->pos_x >= xres ? xres : list->pos_x);
-               list->pos_y += packet->dy;
-               list->pos_y = list->pos_y < 0 ? 0 : (list->pos_y >= yres ? yres : list->pos_y);
+               client->pos_x += packet->dx;
+               client->pos_x = client->pos_x < 0 ?
+                       0 : (client->pos_x >= xres ? xres : client->pos_x);
+               client->pos_y += packet->dy;
+               client->pos_y = client->pos_y < 0 ?
+                       0 : (client->pos_y >= yres ? yres : client->pos_y);
 
                p->dx += packet->dx;
                p->dy += packet->dy;
                p->dz += packet->dz;
                p->buttons = mousedev->packet.buttons;
 
-               if (p->dx || p->dy || p->dz || p->buttons != list->last_buttons)
-                       list->ready = 1;
+               if (p->dx || p->dy || p->dz ||
+                   p->buttons != client->last_buttons)
+                       client->ready = 1;
 
-               spin_unlock_irqrestore(&list->packet_lock, flags);
+               spin_unlock(&client->packet_lock);
 
-               if (list->ready) {
-                       kill_fasync(&list->fasync, SIGIO, POLL_IN);
+               if (client->ready) {
+                       kill_fasync(&client->fasync, SIGIO, POLL_IN);
                        wake_readers = 1;
                }
        }
+       rcu_read_unlock();
 
        if (wake_readers)
                wake_up_interruptible(&mousedev->wait);
@@ -269,140 +320,216 @@ static void mousedev_touchpad_touch(struct mousedev *mousedev, int value)
 {
        if (!value) {
                if (mousedev->touch &&
-                   time_before(jiffies, mousedev->touch + msecs_to_jiffies(tap_time))) {
+                   time_before(jiffies,
+                               mousedev->touch + msecs_to_jiffies(tap_time))) {
                        /*
                         * Toggle left button to emulate tap.
                         * We rely on the fact that mousedev_mix always has 0
                         * motion packet so we won't mess current position.
                         */
                        set_bit(0, &mousedev->packet.buttons);
-                       set_bit(0, &mousedev_mix.packet.buttons);
-                       mousedev_notify_readers(mousedev, &mousedev_mix.packet);
-                       mousedev_notify_readers(&mousedev_mix, &mousedev_mix.packet);
+                       set_bit(0, &mousedev_mix->packet.buttons);
+                       mousedev_notify_readers(mousedev, &mousedev_mix->packet);
+                       mousedev_notify_readers(mousedev_mix,
+                                               &mousedev_mix->packet);
                        clear_bit(0, &mousedev->packet.buttons);
-                       clear_bit(0, &mousedev_mix.packet.buttons);
+                       clear_bit(0, &mousedev_mix->packet.buttons);
                }
                mousedev->touch = mousedev->pkt_count = 0;
                mousedev->frac_dx = 0;
                mousedev->frac_dy = 0;
-       }
-       else
-               if (!mousedev->touch)
-                       mousedev->touch = jiffies;
+
+       } else if (!mousedev->touch)
+               mousedev->touch = jiffies;
 }
 
-static void mousedev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
+static void mousedev_event(struct input_handle *handle,
+                          unsigned int type, unsigned int code, int value)
 {
        struct mousedev *mousedev = handle->private;
 
        switch (type) {
-               case EV_ABS:
-                       /* Ignore joysticks */
-                       if (test_bit(BTN_TRIGGER, handle->dev->keybit))
-                               return;
 
-                       if (test_bit(BTN_TOOL_FINGER, handle->dev->keybit))
-                               mousedev_touchpad_event(handle->dev, mousedev, code, value);
-                       else
-                               mousedev_abs_event(handle->dev, mousedev, code, value);
+       case EV_ABS:
+               /* Ignore joysticks */
+               if (test_bit(BTN_TRIGGER, handle->dev->keybit))
+                       return;
 
-                       break;
+               if (test_bit(BTN_TOOL_FINGER, handle->dev->keybit))
+                       mousedev_touchpad_event(handle->dev,
+                                               mousedev, code, value);
+               else
+                       mousedev_abs_event(handle->dev, mousedev, code, value);
 
-               case EV_REL:
-                       mousedev_rel_event(mousedev, code, value);
-                       break;
+               break;
 
-               case EV_KEY:
-                       if (value != 2) {
-                               if (code == BTN_TOUCH && test_bit(BTN_TOOL_FINGER, handle->dev->keybit))
-                                       mousedev_touchpad_touch(mousedev, value);
-                               else
-                                       mousedev_key_event(mousedev, code, value);
-                       }
-                       break;
+       case EV_REL:
+               mousedev_rel_event(mousedev, code, value);
+               break;
 
-               case EV_SYN:
-                       if (code == SYN_REPORT) {
-                               if (mousedev->touch) {
-                                       mousedev->pkt_count++;
-                                       /* Input system eats duplicate events, but we need all of them
-                                        * to do correct averaging so apply present one forward
-                                        */
-                                       fx(0) = fx(1);
-                                       fy(0) = fy(1);
-                               }
-
-                               mousedev_notify_readers(mousedev, &mousedev->packet);
-                               mousedev_notify_readers(&mousedev_mix, &mousedev->packet);
-
-                               mousedev->packet.dx = mousedev->packet.dy = mousedev->packet.dz = 0;
-                               mousedev->packet.abs_event = 0;
+       case EV_KEY:
+               if (value != 2) {
+                       if (code == BTN_TOUCH &&
+                           test_bit(BTN_TOOL_FINGER, handle->dev->keybit))
+                               mousedev_touchpad_touch(mousedev, value);
+                       else
+                               mousedev_key_event(mousedev, code, value);
+               }
+               break;
+
+       case EV_SYN:
+               if (code == SYN_REPORT) {
+                       if (mousedev->touch) {
+                               mousedev->pkt_count++;
+                               /*
+                                * Input system eats duplicate events,
+                                * but we need all of them to do correct
+                                * averaging so apply present one forward
+                                */
+                               fx(0) = fx(1);
+                               fy(0) = fy(1);
                        }
-                       break;
+
+                       mousedev_notify_readers(mousedev, &mousedev->packet);
+                       mousedev_notify_readers(mousedev_mix, &mousedev->packet);
+
+                       mousedev->packet.dx = mousedev->packet.dy =
+                               mousedev->packet.dz = 0;
+                       mousedev->packet.abs_event = 0;
+               }
+               break;
        }
 }
 
 static int mousedev_fasync(int fd, struct file *file, int on)
 {
-       int retval;
-       struct mousedev_list *list = file->private_data;
-       retval = fasync_helper(fd, file, on, &list->fasync);
-       return retval < 0 ? retval : 0;
+       struct mousedev_client *client = file->private_data;
+
+       return fasync_helper(fd, file, on, &client->fasync);
 }
 
-static void mousedev_free(struct mousedev *mousedev)
+static void mousedev_free(struct device *dev)
 {
-       mousedev_table[mousedev->minor] = NULL;
+       struct mousedev *mousedev = container_of(dev, struct mousedev, dev);
+
+       input_put_device(mousedev->handle.dev);
        kfree(mousedev);
 }
 
-static int mixdev_release(void)
+static int mousedev_open_device(struct mousedev *mousedev)
 {
-       struct input_handle *handle;
+       int retval;
 
-       list_for_each_entry(handle, &mousedev_handler.h_list, h_node) {
-               struct mousedev *mousedev = handle->private;
+       retval = mutex_lock_interruptible(&mousedev->mutex);
+       if (retval)
+               return retval;
 
-               if (!mousedev->open) {
-                       if (mousedev->exist)
-                               input_close_device(&mousedev->handle);
-                       else
-                               mousedev_free(mousedev);
-               }
+       if (mousedev->minor == MOUSEDEV_MIX)
+               mixdev_open_devices();
+       else if (!mousedev->exist)
+               retval = -ENODEV;
+       else if (!mousedev->open++) {
+               retval = input_open_device(&mousedev->handle);
+               if (retval)
+                       mousedev->open--;
        }
 
-       return 0;
+       mutex_unlock(&mousedev->mutex);
+       return retval;
 }
 
-static int mousedev_release(struct inode * inode, struct file * file)
+static void mousedev_close_device(struct mousedev *mousedev)
 {
-       struct mousedev_list *list = file->private_data;
+       mutex_lock(&mousedev->mutex);
 
-       mousedev_fasync(-1, file, 0);
+       if (mousedev->minor == MOUSEDEV_MIX)
+               mixdev_close_devices();
+       else if (mousedev->exist && !--mousedev->open)
+               input_close_device(&mousedev->handle);
 
-       list_del(&list->node);
+       mutex_unlock(&mousedev->mutex);
+}
 
-       if (!--list->mousedev->open) {
-               if (list->mousedev->minor == MOUSEDEV_MIX)
-                       return mixdev_release();
+/*
+ * Open all available devices so they can all be multiplexed in one.
+ * stream. Note that this function is called with mousedev_mix->mutex
+ * held.
+ */
+static void mixdev_open_devices(void)
+{
+       struct mousedev *mousedev;
 
-               if (!mousedev_mix.open) {
-                       if (list->mousedev->exist)
-                               input_close_device(&list->mousedev->handle);
-                       else
-                               mousedev_free(list->mousedev);
+       if (mousedev_mix->open++)
+               return;
+
+       list_for_each_entry(mousedev, &mousedev_mix_list, mixdev_node) {
+               if (!mousedev->mixdev_open) {
+                       if (mousedev_open_device(mousedev))
+                               continue;
+
+                       mousedev->mixdev_open = 1;
                }
        }
+}
+
+/*
+ * Close all devices that were opened as part of multiplexed
+ * device. Note that this function is called with mousedev_mix->mutex
+ * held.
+ */
+static void mixdev_close_devices(void)
+{
+       struct mousedev *mousedev;
+
+       if (--mousedev_mix->open)
+               return;
+
+       list_for_each_entry(mousedev, &mousedev_mix_list, mixdev_node) {
+               if (mousedev->mixdev_open) {
+                       mousedev->mixdev_open = 0;
+                       mousedev_close_device(mousedev);
+               }
+       }
+}
+
+
+static void mousedev_attach_client(struct mousedev *mousedev,
+                                  struct mousedev_client *client)
+{
+       spin_lock(&mousedev->client_lock);
+       list_add_tail_rcu(&client->node, &mousedev->client_list);
+       spin_unlock(&mousedev->client_lock);
+       synchronize_rcu();
+}
+
+static void mousedev_detach_client(struct mousedev *mousedev,
+                                  struct mousedev_client *client)
+{
+       spin_lock(&mousedev->client_lock);
+       list_del_rcu(&client->node);
+       spin_unlock(&mousedev->client_lock);
+       synchronize_rcu();
+}
+
+static int mousedev_release(struct inode *inode, struct file *file)
+{
+       struct mousedev_client *client = file->private_data;
+       struct mousedev *mousedev = client->mousedev;
+
+       mousedev_detach_client(mousedev, client);
+       kfree(client);
+
+       mousedev_close_device(mousedev);
+       put_device(&mousedev->dev);
 
-       kfree(list);
        return 0;
 }
 
-static int mousedev_open(struct inode * inode, struct file * file)
+static int mousedev_open(struct inode *inode, struct file *file)
 {
-       struct mousedev_list *list;
-       struct input_handle *handle;
+       struct mousedev_client *client;
        struct mousedev *mousedev;
+       int error;
        int i;
 
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -412,33 +539,52 @@ static int mousedev_open(struct inode * inode, struct file * file)
 #endif
                i = iminor(inode) - MOUSEDEV_MINOR_BASE;
 
-       if (i >= MOUSEDEV_MINORS || !mousedev_table[i])
+       if (i >= MOUSEDEV_MINORS)
                return -ENODEV;
 
-       if (!(list = kmalloc(sizeof(struct mousedev_list), GFP_KERNEL)))
-               return -ENOMEM;
-       memset(list, 0, sizeof(struct mousedev_list));
-
-       spin_lock_init(&list->packet_lock);
-       list->pos_x = xres / 2;
-       list->pos_y = yres / 2;
-       list->mousedev = mousedev_table[i];
-       list_add_tail(&list->node, &mousedev_table[i]->list);
-       file->private_data = list;
-
-       if (!list->mousedev->open++) {
-               if (list->mousedev->minor == MOUSEDEV_MIX) {
-                       list_for_each_entry(handle, &mousedev_handler.h_list, h_node) {
-                               mousedev = handle->private;
-                               if (!mousedev->open && mousedev->exist)
-                                       input_open_device(handle);
-                       }
-               } else
-                       if (!mousedev_mix.open && list->mousedev->exist)
-                               input_open_device(&list->mousedev->handle);
+       lock_kernel();
+       error = mutex_lock_interruptible(&mousedev_table_mutex);
+       if (error) {
+               unlock_kernel();
+               return error;
        }
+       mousedev = mousedev_table[i];
+       if (mousedev)
+               get_device(&mousedev->dev);
+       mutex_unlock(&mousedev_table_mutex);
+
+       if (!mousedev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       client = kzalloc(sizeof(struct mousedev_client), GFP_KERNEL);
+       if (!client) {
+               error = -ENOMEM;
+               goto err_put_mousedev;
+       }
+
+       spin_lock_init(&client->packet_lock);
+       client->pos_x = xres / 2;
+       client->pos_y = yres / 2;
+       client->mousedev = mousedev;
+       mousedev_attach_client(mousedev, client);
+
+       error = mousedev_open_device(mousedev);
+       if (error)
+               goto err_free_client;
 
+       file->private_data = client;
+       unlock_kernel();
        return 0;
+
+ err_free_client:
+       mousedev_detach_client(mousedev, client);
+       kfree(client);
+ err_put_mousedev:
+       put_device(&mousedev->dev);
+       unlock_kernel();
+       return error;
 }
 
 static inline int mousedev_limit_delta(int delta, int limit)
@@ -446,58 +592,102 @@ static inline int mousedev_limit_delta(int delta, int limit)
        return delta > limit ? limit : (delta < -limit ? -limit : delta);
 }
 
-static void mousedev_packet(struct mousedev_list *list, signed char *ps2_data)
+static void mousedev_packet(struct mousedev_client *client,
+                           signed char *ps2_data)
 {
-       struct mousedev_motion *p;
-       unsigned long flags;
-
-       spin_lock_irqsave(&list->packet_lock, flags);
-       p = &list->packets[list->tail];
+       struct mousedev_motion *p = &client->packets[client->tail];
 
-       ps2_data[0] = 0x08 | ((p->dx < 0) << 4) | ((p->dy < 0) << 5) | (p->buttons & 0x07);
+       ps2_data[0] = 0x08 |
+               ((p->dx < 0) << 4) | ((p->dy < 0) << 5) | (p->buttons & 0x07);
        ps2_data[1] = mousedev_limit_delta(p->dx, 127);
        ps2_data[2] = mousedev_limit_delta(p->dy, 127);
        p->dx -= ps2_data[1];
        p->dy -= ps2_data[2];
 
-       switch (list->mode) {
-               case MOUSEDEV_EMUL_EXPS:
-                       ps2_data[3] = mousedev_limit_delta(p->dz, 7);
-                       p->dz -= ps2_data[3];
-                       ps2_data[3] = (ps2_data[3] & 0x0f) | ((p->buttons & 0x18) << 1);
-                       list->bufsiz = 4;
-                       break;
-
-               case MOUSEDEV_EMUL_IMPS:
-                       ps2_data[0] |= ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
-                       ps2_data[3] = mousedev_limit_delta(p->dz, 127);
-                       p->dz -= ps2_data[3];
-                       list->bufsiz = 4;
-                       break;
-
-               case MOUSEDEV_EMUL_PS2:
-               default:
-                       ps2_data[0] |= ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
-                       p->dz = 0;
-                       list->bufsiz = 3;
-                       break;
+       switch (client->mode) {
+       case MOUSEDEV_EMUL_EXPS:
+               ps2_data[3] = mousedev_limit_delta(p->dz, 7);
+               p->dz -= ps2_data[3];
+               ps2_data[3] = (ps2_data[3] & 0x0f) | ((p->buttons & 0x18) << 1);
+               client->bufsiz = 4;
+               break;
+
+       case MOUSEDEV_EMUL_IMPS:
+               ps2_data[0] |=
+                       ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
+               ps2_data[3] = mousedev_limit_delta(p->dz, 127);
+               p->dz -= ps2_data[3];
+               client->bufsiz = 4;
+               break;
+
+       case MOUSEDEV_EMUL_PS2:
+       default:
+               ps2_data[0] |=
+                       ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
+               p->dz = 0;
+               client->bufsiz = 3;
+               break;
        }
 
        if (!p->dx && !p->dy && !p->dz) {
-               if (list->tail == list->head) {
-                       list->ready = 0;
-                       list->last_buttons = p->buttons;
+               if (client->tail == client->head) {
+                       client->ready = 0;
+                       client->last_buttons = p->buttons;
                } else
-                       list->tail = (list->tail + 1) % PACKET_QUEUE_LEN;
+                       client->tail = (client->tail + 1) % PACKET_QUEUE_LEN;
        }
-
-       spin_unlock_irqrestore(&list->packet_lock, flags);
 }
 
+static void mousedev_generate_response(struct mousedev_client *client,
+                                       int command)
+{
+       client->ps2[0] = 0xfa; /* ACK */
+
+       switch (command) {
+
+       case 0xeb: /* Poll */
+               mousedev_packet(client, &client->ps2[1]);
+               client->bufsiz++; /* account for leading ACK */
+               break;
+
+       case 0xf2: /* Get ID */
+               switch (client->mode) {
+               case MOUSEDEV_EMUL_PS2:
+                       client->ps2[1] = 0;
+                       break;
+               case MOUSEDEV_EMUL_IMPS:
+                       client->ps2[1] = 3;
+                       break;
+               case MOUSEDEV_EMUL_EXPS:
+                       client->ps2[1] = 4;
+                       break;
+               }
+               client->bufsiz = 2;
+               break;
+
+       case 0xe9: /* Get info */
+               client->ps2[1] = 0x60; client->ps2[2] = 3; client->ps2[3] = 200;
+               client->bufsiz = 4;
+               break;
+
+       case 0xff: /* Reset */
+               client->impsseq = client->imexseq = 0;
+               client->mode = MOUSEDEV_EMUL_PS2;
+               client->ps2[1] = 0xaa; client->ps2[2] = 0x00;
+               client->bufsiz = 3;
+               break;
+
+       default:
+               client->bufsiz = 1;
+               break;
+       }
+       client->buffer = client->bufsiz;
+}
 
-static ssize_t mousedev_write(struct file * file, const char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t mousedev_write(struct file *file, const char __user *buffer,
+                               size_t count, loff_t *ppos)
 {
-       struct mousedev_list *list = file->private_data;
+       struct mousedev_client *client = file->private_data;
        unsigned char c;
        unsigned int i;
 
@@ -506,93 +696,71 @@ static ssize_t mousedev_write(struct file * file, const char __user * buffer, si
                if (get_user(c, buffer + i))
                        return -EFAULT;
 
-               if (c == mousedev_imex_seq[list->imexseq]) {
-                       if (++list->imexseq == MOUSEDEV_SEQ_LEN) {
-                               list->imexseq = 0;
-                               list->mode = MOUSEDEV_EMUL_EXPS;
+               spin_lock_irq(&client->packet_lock);
+
+               if (c == mousedev_imex_seq[client->imexseq]) {
+                       if (++client->imexseq == MOUSEDEV_SEQ_LEN) {
+                               client->imexseq = 0;
+                               client->mode = MOUSEDEV_EMUL_EXPS;
                        }
-               } else list->imexseq = 0;
+               } else
+                       client->imexseq = 0;
 
-               if (c == mousedev_imps_seq[list->impsseq]) {
-                       if (++list->impsseq == MOUSEDEV_SEQ_LEN) {
-                               list->impsseq = 0;
-                               list->mode = MOUSEDEV_EMUL_IMPS;
+               if (c == mousedev_imps_seq[client->impsseq]) {
+                       if (++client->impsseq == MOUSEDEV_SEQ_LEN) {
+                               client->impsseq = 0;
+                               client->mode = MOUSEDEV_EMUL_IMPS;
                        }
-               } else list->impsseq = 0;
-
-               list->ps2[0] = 0xfa;
-
-               switch (c) {
-
-                       case 0xeb: /* Poll */
-                               mousedev_packet(list, &list->ps2[1]);
-                               list->bufsiz++; /* account for leading ACK */
-                               break;
-
-                       case 0xf2: /* Get ID */
-                               switch (list->mode) {
-                                       case MOUSEDEV_EMUL_PS2:  list->ps2[1] = 0; break;
-                                       case MOUSEDEV_EMUL_IMPS: list->ps2[1] = 3; break;
-                                       case MOUSEDEV_EMUL_EXPS: list->ps2[1] = 4; break;
-                               }
-                               list->bufsiz = 2;
-                               break;
-
-                       case 0xe9: /* Get info */
-                               list->ps2[1] = 0x60; list->ps2[2] = 3; list->ps2[3] = 200;
-                               list->bufsiz = 4;
-                               break;
-
-                       case 0xff: /* Reset */
-                               list->impsseq = list->imexseq = 0;
-                               list->mode = MOUSEDEV_EMUL_PS2;
-                               list->ps2[1] = 0xaa; list->ps2[2] = 0x00;
-                               list->bufsiz = 3;
-                               break;
-
-                       default:
-                               list->bufsiz = 1;
-                               break;
-               }
+               } else
+                       client->impsseq = 0;
 
-               list->buffer = list->bufsiz;
-       }
+               mousedev_generate_response(client, c);
 
-       kill_fasync(&list->fasync, SIGIO, POLL_IN);
+               spin_unlock_irq(&client->packet_lock);
+       }
 
-       wake_up_interruptible(&list->mousedev->wait);
+       kill_fasync(&client->fasync, SIGIO, POLL_IN);
+       wake_up_interruptible(&client->mousedev->wait);
 
        return count;
 }
 
-static ssize_t mousedev_read(struct file * file, char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t mousedev_read(struct file *file, char __user *buffer,
+                            size_t count, loff_t *ppos)
 {
-       struct mousedev_list *list = file->private_data;
+       struct mousedev_client *client = file->private_data;
+       struct mousedev *mousedev = client->mousedev;
+       signed char data[sizeof(client->ps2)];
        int retval = 0;
 
-       if (!list->ready && !list->buffer && (file->f_flags & O_NONBLOCK))
+       if (!client->ready && !client->buffer && mousedev->exist &&
+           (file->f_flags & O_NONBLOCK))
                return -EAGAIN;
 
-       retval = wait_event_interruptible(list->mousedev->wait,
-                                         !list->mousedev->exist || list->ready || list->buffer);
-
+       retval = wait_event_interruptible(mousedev->wait,
+                       !mousedev->exist || client->ready || client->buffer);
        if (retval)
                return retval;
 
-       if (!list->mousedev->exist)
+       if (!mousedev->exist)
                return -ENODEV;
 
-       if (!list->buffer && list->ready) {
-               mousedev_packet(list, list->ps2);
-               list->buffer = list->bufsiz;
+       spin_lock_irq(&client->packet_lock);
+
+       if (!client->buffer && client->ready) {
+               mousedev_packet(client, client->ps2);
+               client->buffer = client->bufsiz;
        }
 
-       if (count > list->buffer)
-               count = list->buffer;
+       if (count > client->buffer)
+               count = client->buffer;
+
+       memcpy(data, client->ps2 + client->bufsiz - client->buffer, count);
+       client->buffer -= count;
 
-       list->buffer -= count;
+       spin_unlock_irq(&client->packet_lock);
 
-       if (copy_to_user(buffer, list->ps2 + list->bufsiz - list->buffer - count, count))
+       if (copy_to_user(buffer, data, count))
                return -EFAULT;
 
        return count;
@@ -601,13 +769,15 @@ static ssize_t mousedev_read(struct file * file, char __user * buffer, size_t co
 /* No kernel lock - fine */
 static unsigned int mousedev_poll(struct file *file, poll_table *wait)
 {
-       struct mousedev_list *list = file->private_data;
-       poll_wait(file, &list->mousedev->wait, wait);
-       return ((list->ready || list->buffer) ? (POLLIN | POLLRDNORM) : 0) |
-               (list->mousedev->exist ? 0 : (POLLHUP | POLLERR));
+       struct mousedev_client *client = file->private_data;
+       struct mousedev *mousedev = client->mousedev;
+
+       poll_wait(file, &mousedev->wait, wait);
+       return ((client->ready || client->buffer) ? (POLLIN | POLLRDNORM) : 0) |
+               (mousedev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
-static struct file_operations mousedev_fops = {
+static const struct file_operations mousedev_fops = {
        .owner =        THIS_MODULE,
        .read =         mousedev_read,
        .write =        mousedev_write,
@@ -617,97 +787,260 @@ static struct file_operations mousedev_fops = {
        .fasync =       mousedev_fasync,
 };
 
-static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static int mousedev_install_chrdev(struct mousedev *mousedev)
+{
+       mousedev_table[mousedev->minor] = mousedev;
+       return 0;
+}
+
+static void mousedev_remove_chrdev(struct mousedev *mousedev)
+{
+       mutex_lock(&mousedev_table_mutex);
+       mousedev_table[mousedev->minor] = NULL;
+       mutex_unlock(&mousedev_table_mutex);
+}
+
+/*
+ * Mark device non-existent. This disables writes, ioctls and
+ * prevents new users from opening the device. Already posted
+ * blocking reads will stay, however new ones will fail.
+ */
+static void mousedev_mark_dead(struct mousedev *mousedev)
+{
+       mutex_lock(&mousedev->mutex);
+       mousedev->exist = 0;
+       mutex_unlock(&mousedev->mutex);
+}
+
+/*
+ * Wake up users waiting for IO so they can disconnect from
+ * dead device.
+ */
+static void mousedev_hangup(struct mousedev *mousedev)
+{
+       struct mousedev_client *client;
+
+       spin_lock(&mousedev->client_lock);
+       list_for_each_entry(client, &mousedev->client_list, node)
+               kill_fasync(&client->fasync, SIGIO, POLL_HUP);
+       spin_unlock(&mousedev->client_lock);
+
+       wake_up_interruptible(&mousedev->wait);
+}
+
+static void mousedev_cleanup(struct mousedev *mousedev)
+{
+       struct input_handle *handle = &mousedev->handle;
+
+       mousedev_mark_dead(mousedev);
+       mousedev_hangup(mousedev);
+       mousedev_remove_chrdev(mousedev);
+
+       /* mousedev is marked dead so no one else accesses mousedev->open */
+       if (mousedev->open)
+               input_close_device(handle);
+}
+
+static struct mousedev *mousedev_create(struct input_dev *dev,
+                                       struct input_handler *handler,
+                                       int minor)
 {
        struct mousedev *mousedev;
-       struct class_device *cdev;
-       int minor = 0;
+       int error;
 
-       for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++);
-       if (minor == MOUSEDEV_MINORS) {
-               printk(KERN_ERR "mousedev: no more free mousedev devices\n");
-               return NULL;
+       mousedev = kzalloc(sizeof(struct mousedev), GFP_KERNEL);
+       if (!mousedev) {
+               error = -ENOMEM;
+               goto err_out;
        }
 
-       if (!(mousedev = kmalloc(sizeof(struct mousedev), GFP_KERNEL)))
-               return NULL;
-       memset(mousedev, 0, sizeof(struct mousedev));
-
-       INIT_LIST_HEAD(&mousedev->list);
+       INIT_LIST_HEAD(&mousedev->client_list);
+       INIT_LIST_HEAD(&mousedev->mixdev_node);
+       spin_lock_init(&mousedev->client_lock);
+       mutex_init(&mousedev->mutex);
+       lockdep_set_subclass(&mousedev->mutex,
+                            minor == MOUSEDEV_MIX ? MOUSEDEV_MIX : 0);
        init_waitqueue_head(&mousedev->wait);
 
+       if (minor == MOUSEDEV_MIX)
+               dev_set_name(&mousedev->dev, "mice");
+       else
+               dev_set_name(&mousedev->dev, "mouse%d", minor);
+
        mousedev->minor = minor;
        mousedev->exist = 1;
-       mousedev->handle.dev = dev;
-       mousedev->handle.name = mousedev->name;
+       mousedev->handle.dev = input_get_device(dev);
+       mousedev->handle.name = dev_name(&mousedev->dev);
        mousedev->handle.handler = handler;
        mousedev->handle.private = mousedev;
-       sprintf(mousedev->name, "mouse%d", minor);
 
-       if (mousedev_mix.open)
-               input_open_device(&mousedev->handle);
+       mousedev->dev.class = &input_class;
+       if (dev)
+               mousedev->dev.parent = &dev->dev;
+       mousedev->dev.devt = MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor);
+       mousedev->dev.release = mousedev_free;
+       device_initialize(&mousedev->dev);
+
+       if (minor != MOUSEDEV_MIX) {
+               error = input_register_handle(&mousedev->handle);
+               if (error)
+                       goto err_free_mousedev;
+       }
 
-       mousedev_table[minor] = mousedev;
+       error = mousedev_install_chrdev(mousedev);
+       if (error)
+               goto err_unregister_handle;
+
+       error = device_add(&mousedev->dev);
+       if (error)
+               goto err_cleanup_mousedev;
+
+       return mousedev;
+
+ err_cleanup_mousedev:
+       mousedev_cleanup(mousedev);
+ err_unregister_handle:
+       if (minor != MOUSEDEV_MIX)
+               input_unregister_handle(&mousedev->handle);
+ err_free_mousedev:
+       put_device(&mousedev->dev);
+ err_out:
+       return ERR_PTR(error);
+}
 
-       cdev = class_device_create(&input_class, &dev->cdev,
-                       MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
-                       dev->cdev.dev, mousedev->name);
+static void mousedev_destroy(struct mousedev *mousedev)
+{
+       device_del(&mousedev->dev);
+       mousedev_cleanup(mousedev);
+       if (mousedev->minor != MOUSEDEV_MIX)
+               input_unregister_handle(&mousedev->handle);
+       put_device(&mousedev->dev);
+}
+
+static int mixdev_add_device(struct mousedev *mousedev)
+{
+       int retval;
 
-       /* temporary symlink to keep userspace happy */
-       sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
-                         mousedev->name);
+       retval = mutex_lock_interruptible(&mousedev_mix->mutex);
+       if (retval)
+               return retval;
 
-       return &mousedev->handle;
+       if (mousedev_mix->open) {
+               retval = mousedev_open_device(mousedev);
+               if (retval)
+                       goto out;
+
+               mousedev->mixdev_open = 1;
+       }
+
+       get_device(&mousedev->dev);
+       list_add_tail(&mousedev->mixdev_node, &mousedev_mix_list);
+
+ out:
+       mutex_unlock(&mousedev_mix->mutex);
+       return retval;
 }
 
-static void mousedev_disconnect(struct input_handle *handle)
+static void mixdev_remove_device(struct mousedev *mousedev)
 {
-       struct mousedev *mousedev = handle->private;
-       struct mousedev_list *list;
+       mutex_lock(&mousedev_mix->mutex);
 
-       sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name);
-       class_device_destroy(&input_class,
-                       MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
-       mousedev->exist = 0;
+       if (mousedev->mixdev_open) {
+               mousedev->mixdev_open = 0;
+               mousedev_close_device(mousedev);
+       }
 
-       if (mousedev->open) {
-               input_close_device(handle);
-               wake_up_interruptible(&mousedev->wait);
-               list_for_each_entry(list, &mousedev->list, node)
-                       kill_fasync(&list->fasync, SIGIO, POLL_HUP);
-       } else {
-               if (mousedev_mix.open)
-                       input_close_device(handle);
-               mousedev_free(mousedev);
+       list_del_init(&mousedev->mixdev_node);
+       mutex_unlock(&mousedev_mix->mutex);
+
+       put_device(&mousedev->dev);
+}
+
+static int mousedev_connect(struct input_handler *handler,
+                           struct input_dev *dev,
+                           const struct input_device_id *id)
+{
+       struct mousedev *mousedev;
+       int minor;
+       int error;
+
+       for (minor = 0; minor < MOUSEDEV_MINORS; minor++)
+               if (!mousedev_table[minor])
+                       break;
+
+       if (minor == MOUSEDEV_MINORS) {
+               printk(KERN_ERR "mousedev: no more free mousedev devices\n");
+               return -ENFILE;
+       }
+
+       mousedev = mousedev_create(dev, handler, minor);
+       if (IS_ERR(mousedev))
+               return PTR_ERR(mousedev);
+
+       error = mixdev_add_device(mousedev);
+       if (error) {
+               mousedev_destroy(mousedev);
+               return error;
        }
+
+       return 0;
+}
+
+static void mousedev_disconnect(struct input_handle *handle)
+{
+       struct mousedev *mousedev = handle->private;
+
+       mixdev_remove_device(mousedev);
+       mousedev_destroy(mousedev);
 }
 
-static struct input_device_id mousedev_ids[] = {
+static const struct input_device_id mousedev_ids[] = {
        {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
-               .evbit = { BIT(EV_KEY) | BIT(EV_REL) },
-               .keybit = { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) },
-               .relbit = { BIT(REL_X) | BIT(REL_Y) },
-       },      /* A mouse like device, at least one button, two relative axes */
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                               INPUT_DEVICE_ID_MATCH_KEYBIT |
+                               INPUT_DEVICE_ID_MATCH_RELBIT,
+               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
+               .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) },
+               .relbit = { BIT_MASK(REL_X) | BIT_MASK(REL_Y) },
+       },      /* A mouse like device, at least one button,
+                  two relative axes */
        {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
-               .evbit = { BIT(EV_KEY) | BIT(EV_REL) },
-               .relbit = { BIT(REL_WHEEL) },
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                               INPUT_DEVICE_ID_MATCH_RELBIT,
+               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
+               .relbit = { BIT_MASK(REL_WHEEL) },
        },      /* A separate scrollwheel */
        {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
-               .evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
-               .keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
-               .absbit = { BIT(ABS_X) | BIT(ABS_Y) },
-       },      /* A tablet like device, at least touch detection, two absolute axes */
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                               INPUT_DEVICE_ID_MATCH_KEYBIT |
+                               INPUT_DEVICE_ID_MATCH_ABSBIT,
+               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) },
+               .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
+               .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
+       },      /* A tablet like device, at least touch detection,
+                  two absolute axes */
        {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
-               .evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
-               .keybit = { [LONG(BTN_TOOL_FINGER)] = BIT(BTN_TOOL_FINGER) },
-               .absbit = { BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) | BIT(ABS_TOOL_WIDTH) },
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                               INPUT_DEVICE_ID_MATCH_KEYBIT |
+                               INPUT_DEVICE_ID_MATCH_ABSBIT,
+               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) },
+               .keybit = { [BIT_WORD(BTN_TOOL_FINGER)] =
+                               BIT_MASK(BTN_TOOL_FINGER) },
+               .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
+                               BIT_MASK(ABS_PRESSURE) |
+                               BIT_MASK(ABS_TOOL_WIDTH) },
        },      /* A touchpad */
-
-       { },    /* Terminating entry */
+       {
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                       INPUT_DEVICE_ID_MATCH_KEYBIT |
+                       INPUT_DEVICE_ID_MATCH_ABSBIT,
+               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) },
+               .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) },
+               .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
+       },      /* Mouse-like device with absolute X and Y but ordinary
+                  clicks, like hp ILO2 High Performance mouse */
+
+       { },    /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(input, mousedev_ids);
@@ -731,21 +1064,25 @@ static int psaux_registered;
 
 static int __init mousedev_init(void)
 {
-       input_register_handler(&mousedev_handler);
+       int error;
 
-       memset(&mousedev_mix, 0, sizeof(struct mousedev));
-       INIT_LIST_HEAD(&mousedev_mix.list);
-       init_waitqueue_head(&mousedev_mix.wait);
-       mousedev_table[MOUSEDEV_MIX] = &mousedev_mix;
-       mousedev_mix.exist = 1;
-       mousedev_mix.minor = MOUSEDEV_MIX;
+       mousedev_mix = mousedev_create(NULL, &mousedev_handler, MOUSEDEV_MIX);
+       if (IS_ERR(mousedev_mix))
+               return PTR_ERR(mousedev_mix);
 
-       class_device_create(&input_class, NULL,
-                       MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice");
+       error = input_register_handler(&mousedev_handler);
+       if (error) {
+               mousedev_destroy(mousedev_mix);
+               return error;
+       }
 
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
-       if (!(psaux_registered = !misc_register(&psaux_mouse)))
-               printk(KERN_WARNING "mice: could not misc_register the device\n");
+       error = misc_register(&psaux_mouse);
+       if (error)
+               printk(KERN_WARNING "mice: could not register psaux device, "
+                       "error: %d\n", error);
+       else
+               psaux_registered = 1;
 #endif
 
        printk(KERN_INFO "mice: PS/2 mouse device common for all mice\n");
@@ -759,9 +1096,8 @@ static void __exit mousedev_exit(void)
        if (psaux_registered)
                misc_deregister(&psaux_mouse);
 #endif
-       class_device_destroy(&input_class,
-                       MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));
        input_unregister_handler(&mousedev_handler);
+       mousedev_destroy(mousedev_mix);
 }
 
 module_init(mousedev_init);