aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2009-11-27 11:57:15 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-15 21:17:55 -0500
commit38c7c036036c6260606a2a833aaad3794ca22499 (patch)
tree8a41bf5b665a5ba328102e802fc4c7471270b428 /drivers/media/video/cx88
parenteac8ea536aded07004bde917f05a2329902c64b0 (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/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c4
-rw-r--r--drivers/media/video/cx88/cx88-video.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index fbdc1cde56a6..9f02715b4e15 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1296,8 +1296,8 @@ static int blackbird_register_video(struct cx8802_dev *dev)
1296 dev->core->name); 1296 dev->core->name);
1297 return err; 1297 return err;
1298 } 1298 }
1299 printk(KERN_INFO "%s/2: registered device video%d [mpeg]\n", 1299 printk(KERN_INFO "%s/2: registered device %s [mpeg]\n",
1300 dev->core->name, dev->mpeg_dev->num); 1300 dev->core->name, video_device_node_name(dev->mpeg_dev));
1301 return 0; 1301 return 0;
1302} 1302}
1303 1303
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d7e8fcee559c..55063a76a43a 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1916,8 +1916,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1916 core->name); 1916 core->name);
1917 goto fail_unreg; 1917 goto fail_unreg;
1918 } 1918 }
1919 printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n", 1919 printk(KERN_INFO "%s/0: registered device %s [v4l2]\n",
1920 core->name, dev->video_dev->num); 1920 core->name, video_device_node_name(dev->video_dev));
1921 1921
1922 dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi"); 1922 dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi");
1923 err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, 1923 err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
@@ -1927,8 +1927,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1927 core->name); 1927 core->name);
1928 goto fail_unreg; 1928 goto fail_unreg;
1929 } 1929 }
1930 printk(KERN_INFO "%s/0: registered device vbi%d\n", 1930 printk(KERN_INFO "%s/0: registered device %s\n",
1931 core->name, dev->vbi_dev->num); 1931 core->name, video_device_node_name(dev->vbi_dev));
1932 1932
1933 if (core->board.radio.type == CX88_RADIO) { 1933 if (core->board.radio.type == CX88_RADIO) {
1934 dev->radio_dev = cx88_vdev_init(core,dev->pci, 1934 dev->radio_dev = cx88_vdev_init(core,dev->pci,
@@ -1940,8 +1940,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1940 core->name); 1940 core->name);
1941 goto fail_unreg; 1941 goto fail_unreg;
1942 } 1942 }
1943 printk(KERN_INFO "%s/0: registered device radio%d\n", 1943 printk(KERN_INFO "%s/0: registered device %s\n",
1944 core->name, dev->radio_dev->num); 1944 core->name, video_device_node_name(dev->radio_dev));
1945 } 1945 }
1946 1946
1947 /* everything worked */ 1947 /* everything worked */