diff options
author | Dmitry Torokhov <dtor at mail.ru> | 2007-07-16 08:28:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:23:46 -0400 |
commit | 2c8a3a33558d3f5aa18b56eada66fbe712ee6bb7 (patch) | |
tree | b65a1b88c270a7d1ff6b6da16964c2278c3fe81a /drivers/media/video/usbvideo | |
parent | afb758c4b03b17ff856f2bd58e488d152b342875 (diff) |
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>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/quickcam_messenger.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index abe214619092..491505d6fdee 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
@@ -236,7 +236,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev | |||
236 | input_dev->name = "Konicawc snapshot button"; | 236 | input_dev->name = "Konicawc snapshot button"; |
237 | input_dev->phys = cam->input_physname; | 237 | input_dev->phys = cam->input_physname; |
238 | usb_to_input_id(dev, &input_dev->id); | 238 | usb_to_input_id(dev, &input_dev->id); |
239 | input_dev->cdev.dev = &dev->dev; | 239 | input_dev->dev.parent = &dev->dev; |
240 | 240 | ||
241 | input_dev->evbit[0] = BIT(EV_KEY); | 241 | input_dev->evbit[0] = BIT(EV_KEY); |
242 | input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); | 242 | input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); |
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index ec0ff2247f06..f49a4421468c 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
@@ -100,7 +100,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev) | |||
100 | input_dev->name = "QCM button"; | 100 | input_dev->name = "QCM button"; |
101 | input_dev->phys = cam->input_physname; | 101 | input_dev->phys = cam->input_physname; |
102 | usb_to_input_id(dev, &input_dev->id); | 102 | usb_to_input_id(dev, &input_dev->id); |
103 | input_dev->cdev.dev = &dev->dev; | 103 | input_dev->dev.parent = &dev->dev; |
104 | 104 | ||
105 | input_dev->evbit[0] = BIT(EV_KEY); | 105 | input_dev->evbit[0] = BIT(EV_KEY); |
106 | input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); | 106 | input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); |