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/usbvideo | |
| 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/usbvideo')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/konicawc.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/quickcam_messenger.c | 4 |
2 files changed, 8 insertions, 0 deletions
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); |