Input: drivers/input/mice - don't access dev->private directly

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index 8e9421a643bc8929e3f6436f52e12d9030a77820..6c67aa48afb8ba4b28271ef779cc57c2653a4a6c 100644 (file)
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -259,8 +259,6 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
        if (!ptr->dev)
                goto bail0;
 
-       ptr->dev->private = ptr;
-
        if (serio_open(serio, driver))
                goto bail1;
 

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index e6c9e7bb1f997b08a35d5c114e8b5c6b02c22c89..544490589113bf306de9091ee89d20b3163f136e 100644 (file)
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1083,7 +1083,6 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
 {
        struct input_dev *input_dev = psmouse->dev;
 
-       input_dev->private = psmouse;
        input_dev->cdev.dev = &psmouse->ps2dev.serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);

diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 0ac448a82bde3bbd0193d098c0d62be10528634f..1cb40e724fecaf8e90ab5771211812f3a2039cd8 100644 (file)
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -271,7 +271,6 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-       input_dev->private = sermouse;
 
        if (c & 0x01) set_bit(BTN_MIDDLE, input_dev->keybit);
        if (c & 0x02) set_bit(BTN_SIDE, input_dev->keybit);

diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index c3d64fcc858d26f0e3104d2c23328d6aa0d60c5a..d65e8a934e50b13a9807491fe2bcb1274025b07b 100644 (file)
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -509,7 +509,6 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
        input_dev->phys = mouse->phys;
        input_dev->id.bustype = BUS_RS232;
        input_dev->cdev.dev = &serio->dev;
-       input_dev->private = mouse;
 
        set_bit (EV_KEY, input_dev->evbit);             /* We have buttons */
        set_bit (EV_REL, input_dev->evbit);