diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-05-23 19:41:06 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-05-23 19:41:06 -0400 |
| commit | 8c093da2f9ca5301d886dda4ec36726f09d9e23b (patch) | |
| tree | 0514280c5179ccf02ca1322752eee6fdaaaf6772 /linux/drivers/media/video | |
| parent | 4a78e983d25641804f5c0c83b6c10e51063b7872 (diff) | |
| download | mediapointer-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/video')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/konicawc.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/quickcam_messenger.c | 4 |
5 files changed, 20 insertions, 0 deletions
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); |