From 0ca1804f2e4d78e6a037da23f96aa56f762e78fb Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 12 Apr 2007 01:34:02 -0400 Subject: [PATCH] Input: drivers/input/mice - don't access dev->private directly Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/hil_ptr.c | 2 -- drivers/input/mouse/psmouse-base.c | 1 - drivers/input/mouse/sermouse.c | 1 - drivers/input/mouse/vsxxxaa.c | 1 - 4 files changed, 5 deletions(-) diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c index 8e9421a643bc..6c67aa48afb8 100644 --- 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 e6c9e7bb1f99..544490589113 100644 --- 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 0ac448a82bde..1cb40e724fec 100644 --- 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 c3d64fcc858d..d65e8a934e50 100644 --- 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); -- 2.20.1