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>

14 files changed, 40 insertions, 40 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 2d9fc2435f2b..3c11cff00475 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -194,7 +194,6 @@ void saa7146_buffer_timeout(unsigned long data)
 
 static int fops_open(struct file *file)
 {
-        unsigned int minor = video_devdata(file)->minor;
         struct video_device *vdev = video_devdata(file);
         struct saa7146_dev *dev = video_drvdata(file);
         struct saa7146_fh *fh = NULL;
@@ -202,7 +201,7 @@ static int fops_open(struct file *file)
 
         enum v4l2_buf_type type;
 
-        DEB_EE(("file:%p, minor:%d\n", file, minor));
+        DEB_EE(("file:%p, dev:%s\n", file, video_device_node_name(vdev)));
 
         if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a2336915ca70..dcad2f7a995c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3207,11 +3207,12 @@ err:
 static int bttv_open(struct file *file)
 {
         int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct bttv *btv = video_drvdata(file);
         struct bttv_fh *fh;
         enum v4l2_buf_type type = 0;
 
-        dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor);
+        dprintk(KERN_DEBUG "bttv: open dev=%s\n", video_device_node_name(vdev));
 
         lock_kernel();
         if (btv->video_dev->minor == minor) {
@@ -3409,10 +3410,11 @@ static struct video_device bttv_video_template = {
 static int radio_open(struct file *file)
 {
         int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct bttv *btv = video_drvdata(file);
         struct bttv_fh *fh;
 
-        dprintk("bttv: open minor=%d\n",minor);
+        dprintk("bttv: open dev=%s\n", video_device_node_name(vdev));
 
         lock_kernel();
         WARN_ON(btv->radio_dev && btv->radio_dev->minor != minor);
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 4e278db31cc9..c0885c69fd89 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -758,8 +758,8 @@ int cx18_v4l2_open(struct file *filp)
 
         mutex_lock(&cx->serialize_lock);
         if (cx18_init_on_first_open(cx)) {
-                CX18_ERR("Failed to initialize on minor %d\n",
-                         video_dev->minor);
+                CX18_ERR("Failed to initialize on %s\n",
+                         video_device_node_name(video_dev));
                 mutex_unlock(&cx->serialize_lock);
                 return -ENXIO;
         }
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 3fc7a6fe8554..552dff5d6f1d 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1916,7 +1916,6 @@ static int radio_queryctrl(struct file *file, void *priv,
  */
 static int cx231xx_v4l2_open(struct file *filp)
 {
-        int minor = video_devdata(filp)->minor;
         int errCode = 0, radio = 0;
         struct video_device *vdev = video_devdata(filp);
         struct cx231xx *dev = video_drvdata(filp);
@@ -1937,8 +1936,9 @@ static int cx231xx_v4l2_open(struct file *filp)
 
         mutex_lock(&dev->lock);
 
-        cx231xx_videodbg("open minor=%d type=%s users=%d\n",
-                         minor, v4l2_type_names[fh_type], dev->users);
+        cx231xx_videodbg("open dev=%s type=%s users=%d\n",
+                         video_device_node_name(vdev), v4l2_type_names[fh_type],
+                         dev->users);
 
 #if 0
         errCode = cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index e10f28cfef5e..e8ca8bb384d2 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -717,7 +717,6 @@ static int get_resource(struct cx23885_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
         struct video_device *vdev = video_devdata(file);
         struct cx23885_dev *dev = video_drvdata(file);
         struct cx23885_fh *fh;
@@ -736,8 +735,8 @@ static int video_open(struct file *file)
                 break;
         }
 
-        dprintk(1, "open minor=%d radio=%d type=%s\n",
-                minor, radio, v4l2_type_names[type]);
+        dprintk(1, "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);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index f0ef94150d1e..03e592e016fe 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1048,7 +1048,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 
 static int mpeg_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct cx8802_dev *dev = video_drvdata(file);
         struct cx8802_fh *fh;
         struct cx8802_driver *drv = NULL;
@@ -1075,7 +1075,7 @@ static int mpeg_open(struct file *file)
                 unlock_kernel();
                 return -EINVAL;
         }
-        dprintk(1,"open minor=%d\n",minor);
+        dprintk(1, "open dev=%s\n", video_device_node_name(vdev));
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 758399173a52..0013cb4d756a 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -749,7 +749,6 @@ static int get_ressource(struct cx8800_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
         struct video_device *vdev = video_devdata(file);
         struct cx8800_dev *dev = video_drvdata(file);
         struct cx88_core *core;
@@ -773,8 +772,8 @@ static int video_open(struct file *file)
 
         core = dev->core;
 
-        dprintk(1,"open minor=%d radio=%d type=%s\n",
-                minor,radio,v4l2_type_names[type]);
+        dprintk(1, "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);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index dd9bbe88c601..0408727b79c6 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2081,7 +2081,6 @@ static int radio_queryctrl(struct file *file, void *priv,
  */
 static int em28xx_v4l2_open(struct file *filp)
 {
-        int minor = video_devdata(filp)->minor;
         int errCode = 0, radio = 0;
         struct video_device *vdev = video_devdata(filp);
         struct em28xx *dev = video_drvdata(filp);
@@ -2103,8 +2102,9 @@ static int em28xx_v4l2_open(struct file *filp)
 
         mutex_lock(&dev->lock);
 
-        em28xx_videodbg("open minor=%d type=%s users=%d\n",
-                                minor, v4l2_type_names[fh_type], dev->users);
+        em28xx_videodbg("open dev=%s type=%s users=%d\n",
+                        video_device_node_name(vdev), v4l2_type_names[fh_type],
+                        dev->users);
 
 
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index e707ef3086b2..babcabd73c08 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -985,8 +985,8 @@ int ivtv_v4l2_open(struct file *filp)
 
         mutex_lock(&itv->serialize_lock);
         if (ivtv_init_on_first_open(itv)) {
-                IVTV_ERR("Failed to initialize on minor %d\n",
-                                vdev->minor);
+                IVTV_ERR("Failed to initialize on device %s\n",
+                         video_device_node_name(vdev));
                 mutex_unlock(&itv->serialize_lock);
                 return -ENXIO;
         }
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index b636160fd510..939ae8bf58d5 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -5867,8 +5867,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
         ov511_devused |= 1 << nr;
         ov->nr = nr;
 
-        dev_info(&intf->dev, "Device at %s registered to minor %d\n",
-                 ov->usb_path, ov->vdev->minor);
+        dev_info(&intf->dev, "Device at %s registered to %s\n",
+                 ov->usb_path, video_device_node_name(ov->vdev));
 
         usb_set_intfdata(intf, ov);
         if (ov_create_sysfs(ov->vdev)) {
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 0a77108ee06f..f6a4929867db 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -1530,7 +1530,6 @@ static int vidioc_s_parm(struct file *file, void *priv,
 }
 static int s2255_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
         struct video_device *vdev = video_devdata(file);
         struct s2255_dev *dev = video_drvdata(file);
         struct s2255_fh *fh;
@@ -1538,7 +1537,9 @@ static int s2255_open(struct file *file)
         int i = 0;
         int cur_channel = -1;
         int state;
-        dprintk(1, "s2255: open called (minor=%d)\n", minor);
+
+        dprintk(1, "s2255: open called (dev=%s)\n",
+                video_device_node_name(vdev));
 
         lock_kernel();
 
@@ -1650,8 +1651,9 @@ static int s2255_open(struct file *file)
         for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
                 qctl_regs[i] = s2255_qctrl[i].default_value;
 
-        dprintk(1, "s2255drv: open minor=%d type=%s users=%d\n",
-                minor, v4l2_type_names[type], dev->users[cur_channel]);
+        dprintk(1, "s2255drv: open dev=%s type=%s users=%d\n",
+                video_device_node_name(vdev), v4l2_type_names[type],
+                dev->users[cur_channel]);
         dprintk(2, "s2255drv: open: fh=0x%08lx, dev=0x%08lx, vidq=0x%08lx\n",
                 (unsigned long)fh, (unsigned long)dev,
                 (unsigned long)&dev->vidq[cur_channel]);
@@ -1728,7 +1730,8 @@ static int s2255_close(struct file *file)
 {
         struct s2255_fh *fh = file->private_data;
         struct s2255_dev *dev = fh->dev;
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
+
         if (!dev)
                 return -ENODEV;
 
@@ -1748,8 +1751,8 @@ static int s2255_close(struct file *file)
         mutex_unlock(&dev->open_lock);
 
         kref_put(&dev->kref, s2255_destroy);
-        dprintk(1, "s2255: close called (minor=%d, users=%d)\n",
-                minor, dev->users[fh->channel]);
+        dprintk(1, "s2255: close called (dev=%s, users=%d)\n",
+                video_device_node_name(vdev), dev->users[fh->channel]);
         kfree(fh);
         return 0;
 }
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);
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 93e0a258080d..ce197e4cc589 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1222,8 +1222,7 @@ static int vivi_close(struct file *file)
         struct vivi_fh         *fh = file->private_data;
         struct vivi_dev *dev       = fh->dev;
         struct vivi_dmaqueue *vidq = &dev->vidq;
-
-        int minor = video_devdata(file)->minor;
+        struct video_device  *vdev = video_devdata(file);
 
         vivi_stop_thread(vidq);
         videobuf_stop(&fh->vb_vidq);
@@ -1235,8 +1234,8 @@ static int vivi_close(struct file *file)
         dev->users--;
         mutex_unlock(&dev->mutex);
 
-        dprintk(dev, 1, "close called (minor=%d, users=%d)\n",
-                minor, dev->users);
+        dprintk(dev, 1, "close called (dev=%s, users=%d)\n",
+                video_device_node_name(vdev), dev->users);
 
         return 0;
 }