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: mice - 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 28aa7f1c c0f82d57

+4 -4
+1 -1
drivers/input/mouse/hil_ptr.c
··· 378 378 ptr->dev->id.vendor = PCI_VENDOR_ID_HP; 379 379 ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */ 380 380 ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */ 381 - ptr->dev->cdev.dev = &serio->dev; 381 + ptr->dev->dev.parent = &serio->dev; 382 382 383 383 input_register_device(ptr->dev); 384 384 printk(KERN_INFO "input: %s (%s), ID: %d\n",
+1 -1
drivers/input/mouse/psmouse-base.c
··· 1083 1083 { 1084 1084 struct input_dev *input_dev = psmouse->dev; 1085 1085 1086 - input_dev->cdev.dev = &psmouse->ps2dev.serio->dev; 1086 + input_dev->dev.parent = &psmouse->ps2dev.serio->dev; 1087 1087 1088 1088 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); 1089 1089 input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+1 -1
drivers/input/mouse/sermouse.c
··· 266 266 input_dev->id.vendor = sermouse->type; 267 267 input_dev->id.product = c; 268 268 input_dev->id.version = 0x0100; 269 - input_dev->cdev.dev = &serio->dev; 269 + input_dev->dev.parent = &serio->dev; 270 270 271 271 input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); 272 272 input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
+1 -1
drivers/input/mouse/vsxxxaa.c
··· 508 508 input_dev->name = mouse->name; 509 509 input_dev->phys = mouse->phys; 510 510 input_dev->id.bustype = BUS_RS232; 511 - input_dev->cdev.dev = &serio->dev; 511 + input_dev->dev.parent = &serio->dev; 512 512 513 513 set_bit (EV_KEY, input_dev->evbit); /* We have buttons */ 514 514 set_bit (EV_REL, input_dev->evbit);