[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

Input: convert drivers/input/mouse to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 33 insertions, 30 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index b20783f9748a..4acc7fd4cd0f 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -79,8 +79,8 @@ static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
 {
         struct alps_data *priv = psmouse->private;
         unsigned char *packet = psmouse->packet;
-        struct input_dev *dev = &psmouse->dev;
-        struct input_dev *dev2 = &priv->dev2;
+        struct input_dev *dev = psmouse->dev;
+        struct input_dev *dev2 = priv->dev2;
         int x, y, z, ges, fin, left, right, middle;
         int back = 0, forward = 0;
 
@@ -379,20 +379,24 @@ static int alps_reconnect(struct psmouse *psmouse)
 static void alps_disconnect(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
+
         psmouse_reset(psmouse);
-        input_unregister_device(&priv->dev2);
+        input_unregister_device(priv->dev2);
         kfree(priv);
 }
 
 int alps_init(struct psmouse *psmouse)
 {
         struct alps_data *priv;
+        struct input_dev *dev1 = psmouse->dev, *dev2;
         int version;
 
-        psmouse->private = priv = kmalloc(sizeof(struct alps_data), GFP_KERNEL);
-        if (!priv)
+        psmouse->private = priv = kzalloc(sizeof(struct alps_data), GFP_KERNEL);
+        dev2 = input_allocate_device();
+        if (!priv || !dev2)
                 goto init_fail;
-        memset(priv, 0, sizeof(struct alps_data));
+
+        priv->dev2 = dev2;
 
         if (!(priv->i = alps_get_model(psmouse, &version)))
                 goto init_fail;
@@ -411,41 +415,39 @@ int alps_init(struct psmouse *psmouse)
         if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0))
                 goto init_fail;
 
-        psmouse->dev.evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
-        psmouse->dev.keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
-        psmouse->dev.keybit[LONG(BTN_TOOL_FINGER)] |= BIT(BTN_TOOL_FINGER);
-        psmouse->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        dev1->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
+        dev1->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
+        dev1->keybit[LONG(BTN_TOOL_FINGER)] |= BIT(BTN_TOOL_FINGER);
+        dev1->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
 
-        psmouse->dev.evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
-        input_set_abs_params(&psmouse->dev, ABS_X, 0, 1023, 0, 0);
-        input_set_abs_params(&psmouse->dev, ABS_Y, 0, 767, 0, 0);
-        input_set_abs_params(&psmouse->dev, ABS_PRESSURE, 0, 127, 0, 0);
+        dev1->evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
+        input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);
+        input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
+        input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);
 
         if (priv->i->flags & ALPS_WHEEL) {
-                psmouse->dev.evbit[LONG(EV_REL)] |= BIT(EV_REL);
-                psmouse->dev.relbit[LONG(REL_WHEEL)] |= BIT(REL_WHEEL);
+                dev1->evbit[LONG(EV_REL)] |= BIT(EV_REL);
+                dev1->relbit[LONG(REL_WHEEL)] |= BIT(REL_WHEEL);
         }
 
         if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
-                psmouse->dev.keybit[LONG(BTN_FORWARD)] |= BIT(BTN_FORWARD);
-                psmouse->dev.keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
+                dev1->keybit[LONG(BTN_FORWARD)] |= BIT(BTN_FORWARD);
+                dev1->keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
         }
 
         sprintf(priv->phys, "%s/input1", psmouse->ps2dev.serio->phys);
-        priv->dev2.phys = priv->phys;
-        priv->dev2.name = (priv->i->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
-        priv->dev2.id.bustype = BUS_I8042;
-        priv->dev2.id.vendor = 0x0002;
-        priv->dev2.id.product = PSMOUSE_ALPS;
-        priv->dev2.id.version = 0x0000;
-
-        priv->dev2.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        priv->dev2.relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
-        priv->dev2.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        dev2->phys = priv->phys;
+        dev2->name = (priv->i->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
+        dev2->id.bustype = BUS_I8042;
+        dev2->id.vendor  = 0x0002;
+        dev2->id.product = PSMOUSE_ALPS;
+        dev2->id.version = 0x0000;
 
-        input_register_device(&priv->dev2);
+        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+        dev2->relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
+        dev2->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
 
-        printk(KERN_INFO "input: %s on %s\n", priv->dev2.name, psmouse->ps2dev.serio->phys);
+        input_register_device(priv->dev2);
 
         psmouse->protocol_handler = alps_process_byte;
         psmouse->disconnect = alps_disconnect;
@@ -455,6 +457,7 @@ int alps_init(struct psmouse *psmouse)
         return 0;
 
 init_fail:
+        input_free_device(dev2);
         kfree(priv);
         return -1;
 }