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>
This commit is contained in:
Родитель
c0f82d570c
Коммит
28aa7f1c81
|
@ -378,7 +378,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
|
||||||
ptr->dev->id.vendor = PCI_VENDOR_ID_HP;
|
ptr->dev->id.vendor = PCI_VENDOR_ID_HP;
|
||||||
ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */
|
ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */
|
||||||
ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */
|
ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */
|
||||||
ptr->dev->cdev.dev = &serio->dev;
|
ptr->dev->dev.parent = &serio->dev;
|
||||||
|
|
||||||
input_register_device(ptr->dev);
|
input_register_device(ptr->dev);
|
||||||
printk(KERN_INFO "input: %s (%s), ID: %d\n",
|
printk(KERN_INFO "input: %s (%s), ID: %d\n",
|
||||||
|
|
|
@ -1083,7 +1083,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
|
||||||
{
|
{
|
||||||
struct input_dev *input_dev = psmouse->dev;
|
struct input_dev *input_dev = psmouse->dev;
|
||||||
|
|
||||||
input_dev->cdev.dev = &psmouse->ps2dev.serio->dev;
|
input_dev->dev.parent = &psmouse->ps2dev.serio->dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
|
||||||
input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
|
input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
|
||||||
|
|
|
@ -266,7 +266,7 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->id.vendor = sermouse->type;
|
input_dev->id.vendor = sermouse->type;
|
||||||
input_dev->id.product = c;
|
input_dev->id.product = c;
|
||||||
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_REL);
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
|
||||||
input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
|
input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
|
||||||
|
|
|
@ -508,7 +508,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
|
||||||
input_dev->name = mouse->name;
|
input_dev->name = mouse->name;
|
||||||
input_dev->phys = mouse->phys;
|
input_dev->phys = mouse->phys;
|
||||||
input_dev->id.bustype = BUS_RS232;
|
input_dev->id.bustype = BUS_RS232;
|
||||||
input_dev->cdev.dev = &serio->dev;
|
input_dev->dev.parent = &serio->dev;
|
||||||
|
|
||||||
set_bit (EV_KEY, input_dev->evbit); /* We have buttons */
|
set_bit (EV_KEY, input_dev->evbit); /* We have buttons */
|
||||||
set_bit (EV_REL, input_dev->evbit);
|
set_bit (EV_REL, input_dev->evbit);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче