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

Commit 8715c1cf authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: drivers/input/joystick - 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 40b9b0b8

drivers/input/joystick/a3d.c

+4 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void a3d_adc_close(struct gameport *gameport) 


static int a3d_open(struct input_dev *dev)

{

	struct a3d *a3d = dev->private;

	struct a3d *a3d = input_get_drvdata(dev);



	gameport_start_polling(a3d->gameport);

	return 0;
@@ -253,7 +253,7 @@ static int a3d_open(struct input_dev *dev) 


static void a3d_close(struct input_dev *dev)

{

	struct a3d *a3d = dev->private;

	struct a3d *a3d = input_get_drvdata(dev);



	gameport_stop_polling(a3d->gameport);

}
@@ -315,10 +315,11 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) 
	input_dev->id.product = a3d->mode;

	input_dev->id.version = 0x0100;

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

	input_dev->private = a3d;

	input_dev->open = a3d_open;

	input_dev->close = a3d_close;



	input_set_drvdata(input_dev, a3d);



	if (a3d->mode == A3D_MODE_PXL) {



		int axes[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER };

drivers/input/joystick/adi.c

+4 −3
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void adi_poll(struct gameport *gameport) 


static int adi_open(struct input_dev *dev)

{

	struct adi_port *port = dev->private;

	struct adi_port *port = input_get_drvdata(dev);



	gameport_start_polling(port->gameport);

	return 0;
@@ -302,7 +302,7 @@ static int adi_open(struct input_dev *dev) 


static void adi_close(struct input_dev *dev)

{

	struct adi_port *port = dev->private;

	struct adi_port *port = input_get_drvdata(dev);



	gameport_stop_polling(port->gameport);

}
@@ -425,7 +425,8 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half) 
	input_dev->id.product = adi->id;

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &port->gameport->dev;

	input_dev->private = port;



	input_set_drvdata(input_dev, port);



	input_dev->open = adi_open;

	input_dev->close = adi_close;

drivers/input/joystick/analog.c

+5 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void analog_poll(struct gameport *gameport) 


static int analog_open(struct input_dev *dev)

{

	struct analog_port *port = dev->private;

	struct analog_port *port = input_get_drvdata(dev);



	gameport_start_polling(port->gameport);

	return 0;
@@ -355,7 +355,7 @@ static int analog_open(struct input_dev *dev) 


static void analog_close(struct input_dev *dev)

{

	struct analog_port *port = dev->private;

	struct analog_port *port = input_get_drvdata(dev);



	gameport_stop_polling(port->gameport);

}
@@ -450,9 +450,11 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i 
	input_dev->id.product = analog->mask >> 4;

	input_dev->id.version = 0x0100;



	input_set_drvdata(input_dev, port);



	input_dev->open = analog_open;

	input_dev->close = analog_close;

	input_dev->private = port;



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



	for (i = j = 0; i < 4; i++)

drivers/input/joystick/cobra.c

+4 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void cobra_poll(struct gameport *gameport) 


static int cobra_open(struct input_dev *dev)

{

	struct cobra *cobra = dev->private;

	struct cobra *cobra = input_get_drvdata(dev);



	gameport_start_polling(cobra->gameport);

	return 0;
@@ -150,7 +150,7 @@ static int cobra_open(struct input_dev *dev) 


static void cobra_close(struct input_dev *dev)

{

	struct cobra *cobra = dev->private;

	struct cobra *cobra = input_get_drvdata(dev);



	gameport_stop_polling(cobra->gameport);

}
@@ -212,7 +212,8 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv) 
		input_dev->id.product = 0x0008;

		input_dev->id.version = 0x0100;

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

		input_dev->private = cobra;



		input_set_drvdata(input_dev, cobra);



		input_dev->open = cobra_open;

		input_dev->close = cobra_close;

drivers/input/joystick/db9.c

+4 −3
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static void db9_timer(unsigned long private) 


static int db9_open(struct input_dev *dev)

{

	struct db9 *db9 = dev->private;

	struct db9 *db9 = input_get_drvdata(dev);

	struct parport *port = db9->pd->port;

	int err;
@@ -542,7 +542,7 @@ static int db9_open(struct input_dev *dev) 


static void db9_close(struct input_dev *dev)

{

	struct db9 *db9 = dev->private;

	struct db9 *db9 = input_get_drvdata(dev);

	struct parport *port = db9->pd->port;



	mutex_lock(&db9->mutex);
@@ -625,7 +625,8 @@ static struct db9 __init *db9_probe(int parport, int mode) 
		input_dev->id.vendor = 0x0002;

		input_dev->id.product = mode;

		input_dev->id.version = 0x0100;

		input_dev->private = db9;



		input_set_drvdata(input_dev, db9);



		input_dev->open = db9_open;

		input_dev->close = db9_close;