diff options
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-video.c')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index d095aa0d6d19..1c7f84e203e6 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -2027,8 +2027,8 @@ void cx231xx_release_analog_resources(struct cx231xx *dev) | |||
2027 | dev->radio_dev = NULL; | 2027 | dev->radio_dev = NULL; |
2028 | } | 2028 | } |
2029 | if (dev->vbi_dev) { | 2029 | if (dev->vbi_dev) { |
2030 | cx231xx_info("V4L2 device /dev/vbi%d deregistered\n", | 2030 | cx231xx_info("V4L2 device %s deregistered\n", |
2031 | dev->vbi_dev->num); | 2031 | video_device_node_name(dev->vbi_dev)); |
2032 | if (-1 != dev->vbi_dev->minor) | 2032 | if (-1 != dev->vbi_dev->minor) |
2033 | video_unregister_device(dev->vbi_dev); | 2033 | video_unregister_device(dev->vbi_dev); |
2034 | else | 2034 | else |
@@ -2036,8 +2036,8 @@ void cx231xx_release_analog_resources(struct cx231xx *dev) | |||
2036 | dev->vbi_dev = NULL; | 2036 | dev->vbi_dev = NULL; |
2037 | } | 2037 | } |
2038 | if (dev->vdev) { | 2038 | if (dev->vdev) { |
2039 | cx231xx_info("V4L2 device /dev/video%d deregistered\n", | 2039 | cx231xx_info("V4L2 device %s deregistered\n", |
2040 | dev->vdev->num); | 2040 | video_device_node_name(dev->vdev)); |
2041 | if (-1 != dev->vdev->minor) | 2041 | if (-1 != dev->vdev->minor) |
2042 | video_unregister_device(dev->vdev); | 2042 | video_unregister_device(dev->vdev); |
2043 | else | 2043 | else |
@@ -2374,8 +2374,8 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) | |||
2374 | return ret; | 2374 | return ret; |
2375 | } | 2375 | } |
2376 | 2376 | ||
2377 | cx231xx_info("%s/0: registered device video%d [v4l2]\n", | 2377 | cx231xx_info("%s/0: registered device %s [v4l2]\n", |
2378 | dev->name, dev->vdev->num); | 2378 | dev->name, video_device_node_name(dev->vdev)); |
2379 | 2379 | ||
2380 | /* Initialize VBI template */ | 2380 | /* Initialize VBI template */ |
2381 | memcpy(&cx231xx_vbi_template, &cx231xx_video_template, | 2381 | memcpy(&cx231xx_vbi_template, &cx231xx_video_template, |
@@ -2393,8 +2393,8 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) | |||
2393 | return ret; | 2393 | return ret; |
2394 | } | 2394 | } |
2395 | 2395 | ||
2396 | cx231xx_info("%s/0: registered device vbi%d\n", | 2396 | cx231xx_info("%s/0: registered device %s\n", |
2397 | dev->name, dev->vbi_dev->num); | 2397 | dev->name, video_device_node_name(dev->vbi_dev)); |
2398 | 2398 | ||
2399 | if (cx231xx_boards[dev->model].radio.type == CX231XX_RADIO) { | 2399 | if (cx231xx_boards[dev->model].radio.type == CX231XX_RADIO) { |
2400 | dev->radio_dev = cx231xx_vdev_init(dev, &cx231xx_radio_template, | 2400 | dev->radio_dev = cx231xx_vdev_init(dev, &cx231xx_radio_template, |
@@ -2409,12 +2409,13 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) | |||
2409 | cx231xx_errdev("can't register radio device\n"); | 2409 | cx231xx_errdev("can't register radio device\n"); |
2410 | return ret; | 2410 | return ret; |
2411 | } | 2411 | } |
2412 | cx231xx_info("Registered radio device as /dev/radio%d\n", | 2412 | cx231xx_info("Registered radio device as %s\n", |
2413 | dev->radio_dev->num); | 2413 | video_device_node_name(dev->radio_dev)); |
2414 | } | 2414 | } |
2415 | 2415 | ||
2416 | cx231xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n", | 2416 | cx231xx_info("V4L2 device registered as %s and %s\n", |
2417 | dev->vdev->num, dev->vbi_dev->num); | 2417 | video_device_node_name(dev->vdev), |
2418 | video_device_node_name(dev->vbi_dev)); | ||
2418 | 2419 | ||
2419 | return 0; | 2420 | return 0; |
2420 | } | 2421 | } |