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>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 0ba7f5af0fc..c07f0727781 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1046,8 +1046,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                        dev->name);
                 goto fail4;
         }
-        printk(KERN_INFO "%s: registered device video%d [v4l2]\n",
-               dev->name, dev->video_dev->num);
+        printk(KERN_INFO "%s: registered device %s [v4l2]\n",
+               dev->name, video_device_node_name(dev->video_dev));
 
         dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi");
 
@@ -1055,8 +1055,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                                     vbi_nr[dev->nr]);
         if (err < 0)
                 goto fail4;
-        printk(KERN_INFO "%s: registered device vbi%d\n",
-               dev->name, dev->vbi_dev->num);
+        printk(KERN_INFO "%s: registered device %s\n",
+               dev->name, video_device_node_name(dev->vbi_dev));
 
         if (card_has_radio(dev)) {
                 dev->radio_dev = vdev_init(dev,&saa7134_radio_template,"radio");
@@ -1064,8 +1064,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                                             radio_nr[dev->nr]);
                 if (err < 0)
                         goto fail4;
-                printk(KERN_INFO "%s: registered device radio%d\n",
-                       dev->name, dev->radio_dev->num);
+                printk(KERN_INFO "%s: registered device %s\n",
+                       dev->name, video_device_node_name(dev->radio_dev));
         }
 
         /* everything worked */
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 296788c3bf0..abc1d0bf583 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -540,8 +540,8 @@ static int empress_init(struct saa7134_dev *dev)
                 dev->empress_dev = NULL;
                 return err;
         }
-        printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
-               dev->name, dev->empress_dev->num);
+        printk(KERN_INFO "%s: registered device %s [mpeg]\n",
+               dev->name, video_device_node_name(dev->empress_dev));
 
         videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops,
                             &dev->pci->dev, &dev->slock,