Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b9b0b8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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



Use input_get_drvdata() and input_set_drvdata() instead.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 0ca1804f

drivers/input/touchscreen/corgi_ts.c

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ static int __init corgits_probe(struct platform_device *pdev) 
	input_dev->id.product = 0x0002;

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &pdev->dev;

	input_dev->private = corgi_ts;



	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

	input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);

drivers/input/touchscreen/elo.c

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv) 
	init_completion(&elo->cmd_done);

	snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys);



	input_dev->private = elo;

	input_dev->name = "Elo Serial TouchScreen";

	input_dev->phys = elo->phys;

	input_dev->id.bustype = BUS_RS232;

drivers/input/touchscreen/gunze.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv) 
	gunze->dev = input_dev;

	snprintf(gunze->phys, sizeof(serio->phys), "%s/input0", serio->phys);



	input_dev->private = gunze;

	input_dev->name = "Gunze AHL-51S TouchScreen";

	input_dev->phys = gunze->phys;

	input_dev->id.bustype = BUS_RS232;

drivers/input/touchscreen/h3600_ts_input.c

+4 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ enum flite_pwr { 
unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)

{

	unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness;

	struct h3600_dev *ts = dev->private;

	struct h3600_dev *ts = input_get_drvdata(dev);



	/* Must be in this order */

	ts->serio->write(ts->serio, 1);
@@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type, 
			 unsigned int code, int value)

{

#if 0

	struct h3600_dev *ts = dev->private;

	struct h3600_dev *ts = input_get_drvdata(dev);



	switch (type) {

		case EV_LED: {
@@ -368,7 +368,8 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) 
	input_dev->id.product = 0x0666;  /* FIXME !!! We can ask the hardware */

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &serio->dev;

	input_dev->private = ts;



	input_set_drvdata(input_dev, ts);



	input_dev->event = h3600ts_event;

drivers/input/touchscreen/mtouch.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv) 
	mtouch->dev = input_dev;

	snprintf(mtouch->phys, sizeof(mtouch->phys), "%s/input0", serio->phys);



	input_dev->private = mtouch;

	input_dev->name = "MicroTouch Serial TouchScreen";

	input_dev->phys = mtouch->phys;

	input_dev->id.bustype = BUS_RS232;