tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Dmitry Torokhov 469ba4df 88a447a0

+15 -13
+2 -1
drivers/input/keyboard/aaed2000_kbd.c
··· 141 141 input_dev->id.vendor = 0x0001; 142 142 input_dev->id.product = 0x0001; 143 143 input_dev->id.version = 0x0100; 144 - input_dev->cdev.dev = &pdev->dev; 144 + input_dev->dev.parent = &pdev->dev; 145 + 145 146 input_set_drvdata(input_dev, aaedkbd); 146 147 147 148 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+1 -1
drivers/input/keyboard/atkbd.c
··· 883 883 input_dev->id.product = atkbd->translated ? 1 : atkbd->set; 884 884 input_dev->id.version = atkbd->id; 885 885 input_dev->event = atkbd_event; 886 - input_dev->cdev.dev = &atkbd->ps2dev.serio->dev; 886 + input_dev->dev.parent = &atkbd->ps2dev.serio->dev; 887 887 888 888 input_set_drvdata(input_dev, atkbd); 889 889
+1 -1
drivers/input/keyboard/corgikbd.c
··· 323 323 input_dev->id.vendor = 0x0001; 324 324 input_dev->id.product = 0x0001; 325 325 input_dev->id.version = 0x0100; 326 - input_dev->cdev.dev = &pdev->dev; 326 + input_dev->dev.parent = &pdev->dev; 327 327 328 328 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW); 329 329 input_dev->keycode = corgikbd->keycode;
+1 -1
drivers/input/keyboard/gpio_keys.c
··· 65 65 66 66 input->name = pdev->name; 67 67 input->phys = "gpio-keys/input0"; 68 - input->cdev.dev = &pdev->dev; 68 + input->dev.parent = &pdev->dev; 69 69 70 70 input->id.bustype = BUS_HOST; 71 71 input->id.vendor = 0x0001;
+1 -1
drivers/input/keyboard/hil_kbd.c
··· 335 335 kbd->dev->id.vendor = PCI_VENDOR_ID_HP; 336 336 kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */ 337 337 kbd->dev->id.version = 0x0100; /* TODO: get from kbd->rsc */ 338 - kbd->dev->cdev.dev = &serio->dev; 338 + kbd->dev->dev.parent = &serio->dev; 339 339 340 340 for (i = 0; i < 128; i++) { 341 341 set_bit(hil_kbd_set1[i], kbd->dev->keybit);
+1 -1
drivers/input/keyboard/lkkbd.c
··· 666 666 input_dev->id.vendor = SERIO_LKKBD; 667 667 input_dev->id.product = 0; 668 668 input_dev->id.version = 0x0100; 669 - input_dev->cdev.dev = &serio->dev; 669 + input_dev->dev.parent = &serio->dev; 670 670 input_dev->event = lkkbd_event; 671 671 672 672 input_set_drvdata (input_dev, lk);
+1
drivers/input/keyboard/locomokbd.c
··· 231 231 input_dev->id.vendor = 0x0001; 232 232 input_dev->id.product = 0x0001; 233 233 input_dev->id.version = 0x0100; 234 + input_dev->dev.parent = &dev->dev; 234 235 235 236 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); 236 237 input_dev->keycode = locomokbd->keycode;
+1 -1
drivers/input/keyboard/newtonkbd.c
··· 104 104 input_dev->id.vendor = SERIO_NEWTON; 105 105 input_dev->id.product = 0x0001; 106 106 input_dev->id.version = 0x0100; 107 - input_dev->cdev.dev = &serio->dev; 107 + input_dev->dev.parent = &serio->dev; 108 108 109 109 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); 110 110 input_dev->keycode = nkbd->keycode;
+1 -1
drivers/input/keyboard/omap-keypad.c
··· 370 370 set_bit(keymap[i] & KEY_MAX, input_dev->keybit); 371 371 input_dev->name = "omap-keypad"; 372 372 input_dev->phys = "omap-keypad/input0"; 373 - input_dev->cdev.dev = &pdev->dev; 373 + input_dev->dev.parent = &pdev->dev; 374 374 375 375 input_dev->id.bustype = BUS_HOST; 376 376 input_dev->id.vendor = 0x0001;
+1 -1
drivers/input/keyboard/pxa27x_keyboard.c
··· 169 169 input_dev->id.bustype = BUS_HOST; 170 170 input_dev->open = pxakbd_open; 171 171 input_dev->close = pxakbd_close; 172 - input_dev->cdev.dev = &pdev->dev; 172 + input_dev->dev.parent = &pdev->dev; 173 173 174 174 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL); 175 175 input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
+1 -1
drivers/input/keyboard/spitzkbd.c
··· 374 374 375 375 input_dev->name = "Spitz Keyboard"; 376 376 input_dev->phys = spitzkbd->phys; 377 - input_dev->cdev.dev = &dev->dev; 377 + input_dev->dev.parent = &dev->dev; 378 378 379 379 input_dev->id.bustype = BUS_HOST; 380 380 input_dev->id.vendor = 0x0001;
+1 -1
drivers/input/keyboard/stowaway.c
··· 108 108 input_dev->id.vendor = SERIO_STOWAWAY; 109 109 input_dev->id.product = 0x0001; 110 110 input_dev->id.version = 0x0100; 111 - input_dev->cdev.dev = &serio->dev; 111 + input_dev->dev.parent = &serio->dev; 112 112 113 113 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); 114 114 input_dev->keycode = skbd->keycode;
+1 -1
drivers/input/keyboard/sunkbd.c
··· 271 271 input_dev->id.vendor = SERIO_SUNKBD; 272 272 input_dev->id.product = sunkbd->type; 273 273 input_dev->id.version = 0x0100; 274 - input_dev->cdev.dev = &serio->dev; 274 + input_dev->dev.parent = &serio->dev; 275 275 276 276 input_set_drvdata(input_dev, sunkbd); 277 277
+1 -1
drivers/input/keyboard/xtkbd.c
··· 108 108 input_dev->id.vendor = 0x0001; 109 109 input_dev->id.product = 0x0001; 110 110 input_dev->id.version = 0x0100; 111 - input_dev->cdev.dev = &serio->dev; 111 + input_dev->dev.parent = &serio->dev; 112 112 113 113 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); 114 114 input_dev->keycode = xtkbd->keycode;