V4L/DVB (13555): v4l: Use video_device_node_name() instead of the minor number

Instead of using the minor number in kernel log messages, use the device
node name as returned by the video_device_node_name() function. This
makes debug, informational and error messages easier to understand for
end users.

[mchehab.redhat.com: removed tm6000 changes as tm6000 is not ready yet for submission even on staging]

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 1de27af54590..df56241b30a4 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -86,11 +86,11 @@ static int ts_init_encoder(struct saa7134_dev* dev)
 
 static int ts_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct saa7134_dev *dev = video_drvdata(file);
         int err;
 
-        dprintk("open minor=%d\n",minor);
+        dprintk("open dev=%s\n", video_device_node_name(vdev));
         err = -EBUSY;
         if (!mutex_trylock(&dev->empress_tsq.vb_lock))
                 goto done;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index bcca5a479817..9d26b1bd732e 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1326,7 +1326,6 @@ static int saa7134_resource(struct saa7134_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
         struct video_device *vdev = video_devdata(file);
         struct saa7134_dev *dev = video_drvdata(file);
         struct saa7134_fh *fh;
@@ -1345,8 +1344,8 @@ static int video_open(struct file *file)
                 break;
         }
 
-        dprintk("open minor=%d radio=%d type=%s\n",minor,radio,
-                v4l2_type_names[type]);
+        dprintk("open dev=%s radio=%d type=%s\n", video_device_node_name(vdev),
+                radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);