mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
88a447a030
commit
469ba4dff9
14 changed files with 15 additions and 13 deletions
|
@ -141,7 +141,8 @@ static int __devinit aaedkbd_probe(struct platform_device *pdev)
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = &pdev->dev;
|
input_dev->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
input_set_drvdata(input_dev, aaedkbd);
|
input_set_drvdata(input_dev, aaedkbd);
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
||||||
|
|
|
@ -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.product = atkbd->translated ? 1 : atkbd->set;
|
||||||
input_dev->id.version = atkbd->id;
|
input_dev->id.version = atkbd->id;
|
||||||
input_dev->event = atkbd_event;
|
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);
|
input_set_drvdata(input_dev, atkbd);
|
||||||
|
|
||||||
|
|
|
@ -323,7 +323,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
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->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
|
||||||
input_dev->keycode = corgikbd->keycode;
|
input_dev->keycode = corgikbd->keycode;
|
||||||
|
|
|
@ -65,7 +65,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
input->name = pdev->name;
|
input->name = pdev->name;
|
||||||
input->phys = "gpio-keys/input0";
|
input->phys = "gpio-keys/input0";
|
||||||
input->cdev.dev = &pdev->dev;
|
input->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
input->id.bustype = BUS_HOST;
|
input->id.bustype = BUS_HOST;
|
||||||
input->id.vendor = 0x0001;
|
input->id.vendor = 0x0001;
|
||||||
|
|
|
@ -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.vendor = PCI_VENDOR_ID_HP;
|
||||||
kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */
|
kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */
|
||||||
kbd->dev->id.version = 0x0100; /* 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++) {
|
for (i = 0; i < 128; i++) {
|
||||||
set_bit(hil_kbd_set1[i], kbd->dev->keybit);
|
set_bit(hil_kbd_set1[i], kbd->dev->keybit);
|
||||||
|
|
|
@ -666,7 +666,7 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = SERIO_LKKBD;
|
input_dev->id.vendor = SERIO_LKKBD;
|
||||||
input_dev->id.product = 0;
|
input_dev->id.product = 0;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = &serio->dev;
|
input_dev->dev.parent = &serio->dev;
|
||||||
input_dev->event = lkkbd_event;
|
input_dev->event = lkkbd_event;
|
||||||
|
|
||||||
input_set_drvdata (input_dev, lk);
|
input_set_drvdata (input_dev, lk);
|
||||||
|
|
|
@ -231,6 +231,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
|
input_dev->dev.parent = &dev->dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
||||||
input_dev->keycode = locomokbd->keycode;
|
input_dev->keycode = locomokbd->keycode;
|
||||||
|
|
|
@ -104,7 +104,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = SERIO_NEWTON;
|
input_dev->id.vendor = SERIO_NEWTON;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
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_REP);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
||||||
input_dev->keycode = nkbd->keycode;
|
input_dev->keycode = nkbd->keycode;
|
||||||
|
|
|
@ -370,7 +370,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
|
||||||
set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
|
set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
|
||||||
input_dev->name = "omap-keypad";
|
input_dev->name = "omap-keypad";
|
||||||
input_dev->phys = "omap-keypad/input0";
|
input_dev->phys = "omap-keypad/input0";
|
||||||
input_dev->cdev.dev = &pdev->dev;
|
input_dev->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
input_dev->id.bustype = BUS_HOST;
|
input_dev->id.bustype = BUS_HOST;
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
|
|
|
@ -169,7 +169,7 @@ static int __devinit pxakbd_probe(struct platform_device *pdev)
|
||||||
input_dev->id.bustype = BUS_HOST;
|
input_dev->id.bustype = BUS_HOST;
|
||||||
input_dev->open = pxakbd_open;
|
input_dev->open = pxakbd_open;
|
||||||
input_dev->close = pxakbd_close;
|
input_dev->close = pxakbd_close;
|
||||||
input_dev->cdev.dev = &pdev->dev;
|
input_dev->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
|
||||||
input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
|
input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
|
||||||
|
|
|
@ -374,7 +374,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)
|
||||||
|
|
||||||
input_dev->name = "Spitz Keyboard";
|
input_dev->name = "Spitz Keyboard";
|
||||||
input_dev->phys = spitzkbd->phys;
|
input_dev->phys = spitzkbd->phys;
|
||||||
input_dev->cdev.dev = &dev->dev;
|
input_dev->dev.parent = &dev->dev;
|
||||||
|
|
||||||
input_dev->id.bustype = BUS_HOST;
|
input_dev->id.bustype = BUS_HOST;
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
|
|
|
@ -108,7 +108,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = SERIO_STOWAWAY;
|
input_dev->id.vendor = SERIO_STOWAWAY;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
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_REP);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
||||||
input_dev->keycode = skbd->keycode;
|
input_dev->keycode = skbd->keycode;
|
||||||
|
|
|
@ -271,7 +271,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = SERIO_SUNKBD;
|
input_dev->id.vendor = SERIO_SUNKBD;
|
||||||
input_dev->id.product = sunkbd->type;
|
input_dev->id.product = sunkbd->type;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = &serio->dev;
|
input_dev->dev.parent = &serio->dev;
|
||||||
|
|
||||||
input_set_drvdata(input_dev, sunkbd);
|
input_set_drvdata(input_dev, sunkbd);
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = 0x0001;
|
input_dev->id.vendor = 0x0001;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
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_REP);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
||||||
input_dev->keycode = xtkbd->keycode;
|
input_dev->keycode = xtkbd->keycode;
|
||||||
|
|
Loading…
Reference in a new issue