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>

1 files changed, 24 insertions, 20 deletions

diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 88987a57cf7b..f561a1c86791 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -587,8 +587,8 @@ static int et61x251_stream_interrupt(struct et61x251_device* cam)
         else if (cam->stream != STREAM_OFF) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "URB timeout reached. The camera is misconfigured. To "
-                       "use it, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use it, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1195,7 +1195,8 @@ static void et61x251_release_resources(struct kref *kref)
 
         cam = container_of(kref, struct et61x251_device, kref);
 
-        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
+        DBG(2, "V4L2 device %s deregistered",
+            video_device_node_name(cam->v4ldev));
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
         usb_put_dev(cam->usbdev);
@@ -1236,8 +1237,8 @@ static int et61x251_open(struct file *filp)
         }
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is already in use",
-                       cam->v4ldev->num);
+                DBG(2, "Device %s is already in use",
+                       video_device_node_name(cam->v4ldev));
                 DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
@@ -1280,7 +1281,8 @@ static int et61x251_open(struct file *filp)
         cam->frame_count = 0;
         et61x251_empty_framequeues(cam);
 
-        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
+        DBG(3, "Video device %s is open",
+            video_device_node_name(cam->v4ldev));
 
 out:
         mutex_unlock(&cam->open_mutex);
@@ -1304,7 +1306,8 @@ static int et61x251_release(struct file *filp)
         cam->users--;
         wake_up_interruptible_nr(&cam->wait_open, 1);
 
-        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
+        DBG(3, "Video device %s closed",
+            video_device_node_name(cam->v4ldev));
 
         kref_put(&cam->kref, et61x251_release_resources);
 
@@ -1846,8 +1849,8 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1859,8 +1862,8 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
             nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2069,8 +2072,8 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2081,8 +2084,8 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
             nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2130,7 +2133,7 @@ et61x251_vidioc_s_jpegcomp(struct et61x251_device* cam, void __user * arg)
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
                        "problems. To use the camera, close and open "
-                       "/dev/video%d again.", cam->v4ldev->num);
+                       "%s again.", video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2603,7 +2606,8 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
+        DBG(2, "V4L2 device registered as %s",
+            video_device_node_name(cam->v4ldev));
 
         cam->module_param.force_munmap = force_munmap[dev_nr];
         cam->module_param.frame_timeout = frame_timeout[dev_nr];
@@ -2654,9 +2658,9 @@ static void et61x251_usb_disconnect(struct usb_interface* intf)
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred.",
-                    cam->v4ldev->num);
+                DBG(2, "Device %s is open! Deregistration and memory "
+                       "deallocation are deferred.",
+                    video_device_node_name(cam->v4ldev));
                 cam->state |= DEV_MISCONFIGURED;
                 et61x251_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;