Skip to content

Commit

Permalink
Input: joysticks - switch to using input_dev->dev.parent
Browse files Browse the repository at this point in the history 
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: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Apr 12, 2007
1 parent a5394fb commit 935e658
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion drivers/input/joystick/a3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.product = a3d->mode;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;
input_dev->open = a3d_open;
input_dev->close = a3d_close;

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/adi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.product = adi->id;
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);

Expand Down
1 change: 1 addition & 0 deletions drivers/input/joystick/analog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.product = analog->mask >> 4;
input_dev->id.version = 0x0100;
input_dev->dev.parent = &port->gameport->dev;

input_set_drvdata(input_dev, port);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/cobra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.product = 0x0008;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, cobra);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/gf2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.product = gf2k->id;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, gf2k);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/grip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
input_dev->id.product = grip->mode[i];
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, grip);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/grip_mp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ static int register_slot(int slot, struct grip_mp *grip)
input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
input_dev->id.product = 0x0100 + port->mode;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &grip->gameport->dev;
input_dev->dev.parent = &grip->gameport->dev;

input_set_drvdata(input_dev, grip);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/guillemot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
input_dev->id.vendor = GAMEPORT_ID_VENDOR_GUILLEMOT;
input_dev->id.product = guillemot_type[i].id;
input_dev->id.version = (int)data[14] << 8 | data[15];
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, guillemot);

Expand Down
4 changes: 2 additions & 2 deletions drivers/input/joystick/iforce/iforce-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,13 @@ int iforce_init_device(struct iforce *iforce)
#ifdef CONFIG_JOYSTICK_IFORCE_USB
case IFORCE_USB:
input_dev->id.bustype = BUS_USB;
input_dev->cdev.dev = &iforce->usbdev->dev;
input_dev->dev.parent = &iforce->usbdev->dev;
break;
#endif
#ifdef CONFIG_JOYSTICK_IFORCE_232
case IFORCE_232:
input_dev->id.bustype = BUS_RS232;
input_dev->cdev.dev = &iforce->serio->dev;
input_dev->dev.parent = &iforce->serio->dev;
break;
#endif
}
Expand Down
1 change: 1 addition & 0 deletions drivers/input/joystick/interact.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
input_dev->id.vendor = GAMEPORT_ID_VENDOR_INTERACT;
input_dev->id.product = interact_type[i].id;
input_dev->id.version = 0x0100;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, interact);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/magellan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_MAGELLAN;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/sidewinder.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
input_dev->id.vendor = GAMEPORT_ID_VENDOR_MICROSOFT;
input_dev->id.product = sw->type;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &gameport->dev;
input_dev->dev.parent = &gameport->dev;

input_set_drvdata(input_dev, sw);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/spaceball.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_SPACEBALL;
input_dev->id.product = id;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/spaceorb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_SPACEORB;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/stinger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_STINGER;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
input_dev->keybit[LONG(BTN_A)] = BIT(BTN_A) | BIT(BTN_B) | BIT(BTN_C) | BIT(BTN_X) |
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/tmdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
input_dev->id.vendor = GAMEPORT_ID_VENDOR_THRUSTMASTER;
input_dev->id.product = model->id;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &tmdc->gameport->dev;
input_dev->dev.parent = &tmdc->gameport->dev;

input_set_drvdata(input_dev, tmdc);

Expand Down
3 changes: 1 addition & 2 deletions drivers/input/joystick/twidjoy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,9 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_TWIDJOY;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
input_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
input_set_abs_params(input_dev, ABS_X, -50, 50, 4, 4);
input_set_abs_params(input_dev, ABS_Y, -50, 50, 4, 4);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/warrior.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_WARRIOR;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->dev.parent = &serio->dev;

input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
Expand Down

0 comments on commit 935e658

Please sign in to comment.