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

Commit 469ba4df authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: keyboards - 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 88a447a0

drivers/input/keyboard/aaed2000_kbd.c

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ static int __devinit aaedkbd_probe(struct platform_device *pdev) 
	input_dev->id.vendor = 0x0001;

	input_dev->id.product = 0x0001;

	input_dev->id.version = 0x0100;

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

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



	input_set_drvdata(input_dev, aaedkbd);



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

drivers/input/keyboard/atkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd) 
	input_dev->id.product = atkbd->translated ? 1 : atkbd->set;

	input_dev->id.version = atkbd->id;

	input_dev->event = atkbd_event;

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

	input_dev->dev.parent = &atkbd->ps2dev.serio->dev;



	input_set_drvdata(input_dev, atkbd);

drivers/input/keyboard/corgikbd.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int __init corgikbd_probe(struct platform_device *pdev) 
	input_dev->id.vendor = 0x0001;

	input_dev->id.product = 0x0001;

	input_dev->id.version = 0x0100;

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

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



	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);

	input_dev->keycode = corgikbd->keycode;

drivers/input/keyboard/gpio_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 


	input->name = pdev->name;

	input->phys = "gpio-keys/input0";

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

	input->dev.parent = &pdev->dev;



	input->id.bustype = BUS_HOST;

	input->id.vendor = 0x0001;

drivers/input/keyboard/hil_kbd.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv) 
	kbd->dev->id.vendor	= PCI_VENDOR_ID_HP;

	kbd->dev->id.product	= 0x0001; /* TODO: get from kbd->rsc */

	kbd->dev->id.version	= 0x0100; /* TODO: get from kbd->rsc */

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

	kbd->dev->dev.parent	= &serio->dev;



	for (i = 0; i < 128; i++) {

		set_bit(hil_kbd_set1[i], kbd->dev->keybit);