summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-05-23 19:41:06 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2007-05-23 19:41:06 -0400
commit8c093da2f9ca5301d886dda4ec36726f09d9e23b (patch)
tree0514280c5179ccf02ca1322752eee6fdaaaf6772 /linux/drivers/media
parent4a78e983d25641804f5c0c83b6c10e51063b7872 (diff)
downloadmediapointer-dvb-s2-8c093da2f9ca5301d886dda4ec36726f09d9e23b.tar.gz
mediapointer-dvb-s2-8c093da2f9ca5301d886dda4ec36726f09d9e23b.tar.bz2
Input: drivers/media - switch to using input_dev->dev.parent
From: Dmitry Torokhov <dtor at mail.ru> 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>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/dvb/cinergyT2/cinergyT2.c4
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c4
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110_ir.c4
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-ci.c4
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-input.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-input.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c4
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c4
-rw-r--r--linux/drivers/media/video/usbvideo/quickcam_messenger.c4
9 files changed, 36 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index 68796cd8e..30dc9e9db 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -868,11 +868,15 @@ 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;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &cinergyt2->udev->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &cinergyt2->udev->dev;
#else
input_dev->dev = &cinergyt2->udev->dev;
#endif
+#endif
err = input_register_device(input_dev);
if (err) {
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index abf836059..2270e228d 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -124,9 +124,13 @@ 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);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &d->udev->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &d->udev->dev;
#endif
+#endif
/* set the bits for the keys */
deb_rc("key map size: %d\n", d->props.rc_key_map_size);
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index 0e8484b11..e24111719 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -357,12 +357,16 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
input_dev->id.vendor = av7110->dev->pci->vendor;
input_dev->id.product = av7110->dev->pci->device;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &av7110->dev->pci->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &av7110->dev->pci->dev;
#else
input_dev->dev = &av7110->dev->pci->dev;
#endif
#endif
+#endif
/* initial keymap */
memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
input_register_keys(&av7110->ir);
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index 302c5a786..a0e24c779 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -207,12 +207,16 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
input_dev->id.vendor = saa->pci->vendor;
input_dev->id.product = saa->pci->device;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &saa->pci->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &saa->pci->dev;
#else
input_dev->dev = &saa->pci->dev;
#endif
#endif
+#endif
/* Select keymap and address */
switch (budget_ci->budget.dev->pci->subsystem_device) {
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c
index d25b4c912..fb5df7238 100644
--- a/linux/drivers/media/video/bt8xx/bttv-input.c
+++ b/linux/drivers/media/video/bt8xx/bttv-input.c
@@ -315,12 +315,16 @@ int bttv_input_init(struct bttv *btv)
input_dev->id.vendor = btv->c.pci->vendor;
input_dev->id.product = btv->c.pci->device;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &btv->c.pci->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &btv->c.pci->dev;
#else
input_dev->dev = &btv->c.pci->dev;
#endif
#endif
+#endif
btv->remote = ir;
bttv_ir_start(btv, ir);
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index a2e34e901..340523382 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -338,12 +338,16 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
input_dev->id.vendor = pci->vendor;
input_dev->id.product = pci->device;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &pci->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &pci->dev;
#else
input_dev->dev = &pci->dev;
#endif
#endif
+#endif
/* record handles to ourself */
ir->core = core;
core->ir = ir;
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index c505076ae..2e32a86b4 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -379,12 +379,16 @@ int saa7134_input_init1(struct saa7134_dev *dev)
input_dev->id.vendor = dev->pci->vendor;
input_dev->id.product = dev->pci->device;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &dev->pci->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &dev->pci->dev;
#else
input_dev->dev = &dev->pci->dev;
#endif
#endif
+#endif
dev->remote = ir;
saa7134_ir_start(dev, ir);
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index 8ca93f248..2d5ab2044 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -243,11 +243,15 @@ 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);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &dev->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &dev->dev;
#else
input_dev->dev = &dev->dev;
#endif
+#endif
input_dev->evbit[0] = BIT(EV_KEY);
input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index 849f94bab..9593c8aa3 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -105,11 +105,15 @@ 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);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ input_dev->dev.parent = &dev->dev;
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &dev->dev;
#else
input_dev->dev = &dev->dev;
#endif
+#endif
input_dev->evbit[0] = BIT(EV_KEY);
input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 19:28:33 +0000