aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index af33653f0db..82c39767ba3 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -489,7 +489,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
489 up(&usbvision->lock); 489 up(&usbvision->lock);
490 490
491 if (usbvision->remove_pending) { 491 if (usbvision->remove_pending) {
492 info("%s: Final disconnect", __FUNCTION__); 492 printk(KERN_INFO "%s: Final disconnect\n", __FUNCTION__);
493 usbvision_release(usbvision); 493 usbvision_release(usbvision);
494 } 494 }
495 495
@@ -1285,7 +1285,7 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
1285 up(&usbvision->lock); 1285 up(&usbvision->lock);
1286 1286
1287 if (usbvision->remove_pending) { 1287 if (usbvision->remove_pending) {
1288 info("%s: Final disconnect", __FUNCTION__); 1288 printk(KERN_INFO "%s: Final disconnect\n", __FUNCTION__);
1289 usbvision_release(usbvision); 1289 usbvision_release(usbvision);
1290 } 1290 }
1291 1291
@@ -1611,7 +1611,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1611 if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr)<0) { 1611 if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr)<0) {
1612 goto err_exit; 1612 goto err_exit;
1613 } 1613 }
1614 info("USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]", usbvision->nr,usbvision->vdev->minor & 0x1f); 1614 printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n", usbvision->nr,usbvision->vdev->minor & 0x1f);
1615 1615
1616 // Radio Device: 1616 // Radio Device:
1617 if (usbvision_device_data[usbvision->DevModel].Radio) { 1617 if (usbvision_device_data[usbvision->DevModel].Radio) {
@@ -1623,7 +1623,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1623 if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr)<0) { 1623 if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr)<0) {
1624 goto err_exit; 1624 goto err_exit;
1625 } 1625 }
1626 info("USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]", usbvision->nr, usbvision->rdev->minor & 0x1f); 1626 printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n", usbvision->nr, usbvision->rdev->minor & 0x1f);
1627 } 1627 }
1628 // vbi Device: 1628 // vbi Device:
1629 if (usbvision_device_data[usbvision->DevModel].vbi) { 1629 if (usbvision_device_data[usbvision->DevModel].vbi) {
@@ -1634,7 +1634,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1634 if (video_register_device(usbvision->vbi, VFL_TYPE_VBI, vbi_nr)<0) { 1634 if (video_register_device(usbvision->vbi, VFL_TYPE_VBI, vbi_nr)<0) {
1635 goto err_exit; 1635 goto err_exit;
1636 } 1636 }
1637 info("USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)", usbvision->nr,usbvision->vbi->minor & 0x1f); 1637 printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n", usbvision->nr,usbvision->vbi->minor & 0x1f);
1638 } 1638 }
1639 // all done 1639 // all done
1640 return 0; 1640 return 0;
@@ -1783,7 +1783,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf, const struct us
1783 continue; 1783 continue;
1784 } 1784 }
1785 1785
1786 info("%s: %s found", __FUNCTION__, usbvision_device_data[model].ModelString); 1786 printk(KERN_INFO "%s: %s found\n", __FUNCTION__, usbvision_device_data[model].ModelString);
1787 break; 1787 break;
1788 } 1788 }
1789 1789
@@ -1895,7 +1895,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
1895 up(&usbvision->lock); 1895 up(&usbvision->lock);
1896 1896
1897 if (usbvision->user) { 1897 if (usbvision->user) {
1898 info("%s: In use, disconnect pending", __FUNCTION__); 1898 printk(KERN_INFO "%s: In use, disconnect pending\n", __FUNCTION__);
1899 wake_up_interruptible(&usbvision->wait_frame); 1899 wake_up_interruptible(&usbvision->wait_frame);
1900 wake_up_interruptible(&usbvision->wait_stream); 1900 wake_up_interruptible(&usbvision->wait_stream);
1901 } 1901 }
@@ -2061,7 +2061,7 @@ static int __init usbvision_init(void)
2061 errCode = usb_register(&usbvision_driver); 2061 errCode = usb_register(&usbvision_driver);
2062 2062
2063 if (errCode == 0) { 2063 if (errCode == 0) {
2064 info(DRIVER_DESC " : " USBVISION_VERSION_STRING); 2064 printk(KERN_INFO DRIVER_DESC " : " USBVISION_VERSION_STRING "\n");
2065 PDEBUG(DBG_PROBE, "success"); 2065 PDEBUG(DBG_PROBE, "success");
2066 } 2066 }
2067 return errCode; 2067 return errCode;