diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2009-11-27 11:57:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-15 21:17:55 -0500 |
commit | 38c7c036036c6260606a2a833aaad3794ca22499 (patch) | |
tree | 8a41bf5b665a5ba328102e802fc4c7471270b428 /drivers/media/video/usbvideo | |
parent | eac8ea536aded07004bde917f05a2329902c64b0 (diff) |
V4L/DVB (13550): v4l: Use the new video_device_node_name function
Fix all device drivers to use the new video_device_node_name function.
This also strips kernel log messages from the "/dev/" prefix, has the device
node location is a userspace policy decision unknown to the kernel.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index dea8b321fb4a..5ac37c6c4313 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -1053,9 +1053,9 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) | |||
1053 | "%s: video_register_device() successful\n", __func__); | 1053 | "%s: video_register_device() successful\n", __func__); |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n", | 1056 | dev_info(&uvd->dev->dev, "%s on %s: canvas=%s videosize=%s\n", |
1057 | (uvd->handle != NULL) ? uvd->handle->drvName : "???", | 1057 | (uvd->handle != NULL) ? uvd->handle->drvName : "???", |
1058 | uvd->vdev.num, tmp2, tmp1); | 1058 | video_device_node_name(&uvd->vdev), tmp2, tmp1); |
1059 | 1059 | ||
1060 | usb_get_dev(uvd->dev); | 1060 | usb_get_dev(uvd->dev); |
1061 | return 0; | 1061 | return 0; |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 45fce39ec9ad..b75143ee5dd8 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -873,8 +873,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id) | |||
873 | return -EIO; | 873 | return -EIO; |
874 | } | 874 | } |
875 | 875 | ||
876 | printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n", | 876 | printk(KERN_INFO "ViCam webcam driver now controlling device %s\n", |
877 | cam->vdev.num); | 877 | video_device_node_name(&cam->vdev)); |
878 | 878 | ||
879 | usb_set_intfdata (intf, cam); | 879 | usb_set_intfdata (intf, cam); |
880 | 880 | ||