forked from luck/tmp_suning_uos_patched
V4L/DVB (5698): Input: drivers/media - 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 at mail.ru> Acked-by: Thierry Merle <thierry.merle@free.fr> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
afb758c4b0
commit
2c8a3a3355
@ -829,7 +829,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
|
||||
input_dev->id.vendor = cinergyt2->udev->descriptor.idVendor;
|
||||
input_dev->id.product = cinergyt2->udev->descriptor.idProduct;
|
||||
input_dev->id.version = 1;
|
||||
input_dev->cdev.dev = &cinergyt2->udev->dev;
|
||||
input_dev->dev.parent = &cinergyt2->udev->dev;
|
||||
|
||||
err = input_register_device(input_dev);
|
||||
if (err) {
|
||||
|
@ -110,7 +110,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
|
||||
input_dev->name = "IR-receiver inside an USB DVB receiver";
|
||||
input_dev->phys = d->rc_phys;
|
||||
usb_to_input_id(d->udev, &input_dev->id);
|
||||
input_dev->cdev.dev = &d->udev->dev;
|
||||
input_dev->dev.parent = &d->udev->dev;
|
||||
|
||||
/* set the bits for the keys */
|
||||
deb_rc("key map size: %d\n", d->props.rc_key_map_size);
|
||||
|
@ -356,7 +356,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
|
||||
input_dev->id.vendor = av7110->dev->pci->vendor;
|
||||
input_dev->id.product = av7110->dev->pci->device;
|
||||
}
|
||||
input_dev->cdev.dev = &av7110->dev->pci->dev;
|
||||
input_dev->dev.parent = &av7110->dev->pci->dev;
|
||||
/* initial keymap */
|
||||
memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
|
||||
input_register_keys(&av7110->ir);
|
||||
|
@ -206,7 +206,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
|
||||
input_dev->id.vendor = saa->pci->vendor;
|
||||
input_dev->id.product = saa->pci->device;
|
||||
}
|
||||
input_dev->cdev.dev = &saa->pci->dev;
|
||||
input_dev->dev.parent = &saa->pci->dev;
|
||||
|
||||
/* Select keymap and address */
|
||||
switch (budget_ci->budget.dev->pci->subsystem_device) {
|
||||
|
@ -313,7 +313,7 @@ int bttv_input_init(struct bttv *btv)
|
||||
input_dev->id.vendor = btv->c.pci->vendor;
|
||||
input_dev->id.product = btv->c.pci->device;
|
||||
}
|
||||
input_dev->cdev.dev = &btv->c.pci->dev;
|
||||
input_dev->dev.parent = &btv->c.pci->dev;
|
||||
|
||||
btv->remote = ir;
|
||||
bttv_ir_start(btv, ir);
|
||||
|
@ -324,7 +324,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
|
||||
input_dev->id.vendor = pci->vendor;
|
||||
input_dev->id.product = pci->device;
|
||||
}
|
||||
input_dev->cdev.dev = &pci->dev;
|
||||
input_dev->dev.parent = &pci->dev;
|
||||
/* record handles to ourself */
|
||||
ir->core = core;
|
||||
core->ir = ir;
|
||||
|
@ -377,7 +377,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
|
||||
input_dev->id.vendor = dev->pci->vendor;
|
||||
input_dev->id.product = dev->pci->device;
|
||||
}
|
||||
input_dev->cdev.dev = &dev->pci->dev;
|
||||
input_dev->dev.parent = &dev->pci->dev;
|
||||
|
||||
dev->remote = ir;
|
||||
saa7134_ir_start(dev, ir);
|
||||
|
@ -236,7 +236,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
|
||||
input_dev->name = "Konicawc snapshot button";
|
||||
input_dev->phys = cam->input_physname;
|
||||
usb_to_input_id(dev, &input_dev->id);
|
||||
input_dev->cdev.dev = &dev->dev;
|
||||
input_dev->dev.parent = &dev->dev;
|
||||
|
||||
input_dev->evbit[0] = BIT(EV_KEY);
|
||||
input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
|
||||
|
@ -100,7 +100,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
|
||||
input_dev->name = "QCM button";
|
||||
input_dev->phys = cam->input_physname;
|
||||
usb_to_input_id(dev, &input_dev->id);
|
||||
input_dev->cdev.dev = &dev->dev;
|
||||
input_dev->dev.parent = &dev->dev;
|
||||
|
||||
input_dev->evbit[0] = BIT(EV_KEY);
|
||||
input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
|
||||
|
Loading…
Reference in New Issue
Block a user