Commit 935e658e authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: joysticks - switch to using input_dev->dev.parent 



In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.

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

drivers/input/joystick/a3d.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) 
	input_dev->id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;

	input_dev->id.product = a3d->mode;

	input_dev->id.product = a3d->mode;

	input_dev->id.version = 0x0100;

	input_dev->id.version = 0x0100;

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

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

	input_dev->open = a3d_open;

	input_dev->open = a3d_open;

	input_dev->close = a3d_close;

	input_dev->close = a3d_close;

drivers/input/joystick/adi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -424,7 +424,7 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half) 
	input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;

	input_dev->id.product = adi->id;

	input_dev->id.product = adi->id;

	input_dev->id.version = 0x0100;

	input_dev->id.version = 0x0100;

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

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





	input_set_drvdata(input_dev, port);

	input_set_drvdata(input_dev, port);

drivers/input/joystick/analog.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -449,6 +449,7 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i 
	input_dev->id.vendor = GAMEPORT_ID_VENDOR_ANALOG;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_ANALOG;

	input_dev->id.product = analog->mask >> 4;

	input_dev->id.product = analog->mask >> 4;

	input_dev->id.version = 0x0100;

	input_dev->id.version = 0x0100;

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





	input_set_drvdata(input_dev, port);

	input_set_drvdata(input_dev, port);

drivers/input/joystick/cobra.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv) 
		input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;

		input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;

		input_dev->id.product = 0x0008;

		input_dev->id.product = 0x0008;

		input_dev->id.version = 0x0100;

		input_dev->id.version = 0x0100;

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

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





		input_set_drvdata(input_dev, cobra);

		input_set_drvdata(input_dev, cobra);

drivers/input/joystick/gf2k.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -308,7 +308,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv) 
	input_dev->id.vendor = GAMEPORT_ID_VENDOR_GENIUS;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_GENIUS;

	input_dev->id.product = gf2k->id;

	input_dev->id.product = gf2k->id;

	input_dev->id.version = 0x0100;

	input_dev->id.version = 0x0100;

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

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





	input_set_drvdata(input_dev, gf2k);

	input_set_drvdata(input_dev, gf2k);