Commit baa057e2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab

media: v4l2-dev: use pr_foo() for printing messages

Instead of using printk() directly, use the pr_foo()
macros.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent fd32d534
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* - Added procfs support * - Added procfs support
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -34,6 +36,12 @@ ...@@ -34,6 +36,12 @@
#define VIDEO_NUM_DEVICES 256 #define VIDEO_NUM_DEVICES 256
#define VIDEO_NAME "video4linux" #define VIDEO_NAME "video4linux"
#define dprintk(fmt, arg...) do { \
printk(KERN_DEBUG pr_fmt("%s: " fmt), \
__func__, ##arg); \
} while (0)
/* /*
* sysfs stuff * sysfs stuff
*/ */
...@@ -309,7 +317,7 @@ static ssize_t v4l2_read(struct file *filp, char __user *buf, ...@@ -309,7 +317,7 @@ static ssize_t v4l2_read(struct file *filp, char __user *buf,
ret = vdev->fops->read(filp, buf, sz, off); ret = vdev->fops->read(filp, buf, sz, off);
if ((vdev->dev_debug & V4L2_DEV_DEBUG_FOP) && if ((vdev->dev_debug & V4L2_DEV_DEBUG_FOP) &&
(vdev->dev_debug & V4L2_DEV_DEBUG_STREAMING)) (vdev->dev_debug & V4L2_DEV_DEBUG_STREAMING))
printk(KERN_DEBUG "%s: read: %zd (%d)\n", dprintk("%s: read: %zd (%d)\n",
video_device_node_name(vdev), sz, ret); video_device_node_name(vdev), sz, ret);
return ret; return ret;
} }
...@@ -326,7 +334,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf, ...@@ -326,7 +334,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
ret = vdev->fops->write(filp, buf, sz, off); ret = vdev->fops->write(filp, buf, sz, off);
if ((vdev->dev_debug & V4L2_DEV_DEBUG_FOP) && if ((vdev->dev_debug & V4L2_DEV_DEBUG_FOP) &&
(vdev->dev_debug & V4L2_DEV_DEBUG_STREAMING)) (vdev->dev_debug & V4L2_DEV_DEBUG_STREAMING))
printk(KERN_DEBUG "%s: write: %zd (%d)\n", dprintk("%s: write: %zd (%d)\n",
video_device_node_name(vdev), sz, ret); video_device_node_name(vdev), sz, ret);
return ret; return ret;
} }
...@@ -341,7 +349,7 @@ static __poll_t v4l2_poll(struct file *filp, struct poll_table_struct *poll) ...@@ -341,7 +349,7 @@ static __poll_t v4l2_poll(struct file *filp, struct poll_table_struct *poll)
if (video_is_registered(vdev)) if (video_is_registered(vdev))
res = vdev->fops->poll(filp, poll); res = vdev->fops->poll(filp, poll);
if (vdev->dev_debug & V4L2_DEV_DEBUG_POLL) if (vdev->dev_debug & V4L2_DEV_DEBUG_POLL)
printk(KERN_DEBUG "%s: poll: %08x\n", dprintk("%s: poll: %08x\n",
video_device_node_name(vdev), res); video_device_node_name(vdev), res);
return res; return res;
} }
...@@ -382,7 +390,7 @@ static unsigned long v4l2_get_unmapped_area(struct file *filp, ...@@ -382,7 +390,7 @@ static unsigned long v4l2_get_unmapped_area(struct file *filp,
return -ENODEV; return -ENODEV;
ret = vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags); ret = vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP) if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP)
printk(KERN_DEBUG "%s: get_unmapped_area (%d)\n", dprintk("%s: get_unmapped_area (%d)\n",
video_device_node_name(vdev), ret); video_device_node_name(vdev), ret);
return ret; return ret;
} }
...@@ -398,7 +406,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm) ...@@ -398,7 +406,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
if (video_is_registered(vdev)) if (video_is_registered(vdev))
ret = vdev->fops->mmap(filp, vm); ret = vdev->fops->mmap(filp, vm);
if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP) if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP)
printk(KERN_DEBUG "%s: mmap (%d)\n", dprintk("%s: mmap (%d)\n",
video_device_node_name(vdev), ret); video_device_node_name(vdev), ret);
return ret; return ret;
} }
...@@ -428,7 +436,7 @@ static int v4l2_open(struct inode *inode, struct file *filp) ...@@ -428,7 +436,7 @@ static int v4l2_open(struct inode *inode, struct file *filp)
} }
if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP) if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP)
printk(KERN_DEBUG "%s: open (%d)\n", dprintk("%s: open (%d)\n",
video_device_node_name(vdev), ret); video_device_node_name(vdev), ret);
/* decrease the refcount in case of an error */ /* decrease the refcount in case of an error */
if (ret) if (ret)
...@@ -445,7 +453,7 @@ static int v4l2_release(struct inode *inode, struct file *filp) ...@@ -445,7 +453,7 @@ static int v4l2_release(struct inode *inode, struct file *filp)
if (vdev->fops->release) if (vdev->fops->release)
ret = vdev->fops->release(filp); ret = vdev->fops->release(filp);
if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP) if (vdev->dev_debug & V4L2_DEV_DEBUG_FOP)
printk(KERN_DEBUG "%s: release\n", dprintk("%s: release\n",
video_device_node_name(vdev)); video_device_node_name(vdev));
/* decrease the refcount unconditionally since the release() /* decrease the refcount unconditionally since the release()
...@@ -786,8 +794,7 @@ static int video_register_media_controller(struct video_device *vdev, int type) ...@@ -786,8 +794,7 @@ static int video_register_media_controller(struct video_device *vdev, int type)
ret = media_device_register_entity(vdev->v4l2_dev->mdev, ret = media_device_register_entity(vdev->v4l2_dev->mdev,
&vdev->entity); &vdev->entity);
if (ret < 0) { if (ret < 0) {
printk(KERN_WARNING pr_warn("%s: media_device_register_entity failed\n",
"%s: media_device_register_entity failed\n",
__func__); __func__);
return ret; return ret;
} }
...@@ -869,7 +876,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -869,7 +876,7 @@ int __video_register_device(struct video_device *vdev,
name_base = "v4l-touch"; name_base = "v4l-touch";
break; break;
default: default:
printk(KERN_ERR "%s called with unknown type: %d\n", pr_err("%s called with unknown type: %d\n",
__func__, type); __func__, type);
return -EINVAL; return -EINVAL;
} }
...@@ -918,7 +925,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -918,7 +925,7 @@ int __video_register_device(struct video_device *vdev,
if (nr == minor_cnt) if (nr == minor_cnt)
nr = devnode_find(vdev, 0, minor_cnt); nr = devnode_find(vdev, 0, minor_cnt);
if (nr == minor_cnt) { if (nr == minor_cnt) {
printk(KERN_ERR "could not get a free device node number\n"); pr_err("could not get a free device node number\n");
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
return -ENFILE; return -ENFILE;
} }
...@@ -933,7 +940,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -933,7 +940,7 @@ int __video_register_device(struct video_device *vdev,
break; break;
if (i == VIDEO_NUM_DEVICES) { if (i == VIDEO_NUM_DEVICES) {
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
printk(KERN_ERR "could not get a free minor\n"); pr_err("could not get a free minor\n");
return -ENFILE; return -ENFILE;
} }
#endif #endif
...@@ -943,7 +950,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -943,7 +950,7 @@ int __video_register_device(struct video_device *vdev,
/* Should not happen since we thought this minor was free */ /* Should not happen since we thought this minor was free */
if (WARN_ON(video_device[vdev->minor])) { if (WARN_ON(video_device[vdev->minor])) {
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
printk(KERN_ERR "video_device not empty!\n"); pr_err("video_device not empty!\n");
return -ENFILE; return -ENFILE;
} }
devnode_set(vdev); devnode_set(vdev);
...@@ -964,7 +971,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -964,7 +971,7 @@ int __video_register_device(struct video_device *vdev,
vdev->cdev->owner = owner; vdev->cdev->owner = owner;
ret = cdev_add(vdev->cdev, MKDEV(VIDEO_MAJOR, vdev->minor), 1); ret = cdev_add(vdev->cdev, MKDEV(VIDEO_MAJOR, vdev->minor), 1);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s: cdev_add failed\n", __func__); pr_err("%s: cdev_add failed\n", __func__);
kfree(vdev->cdev); kfree(vdev->cdev);
vdev->cdev = NULL; vdev->cdev = NULL;
goto cleanup; goto cleanup;
...@@ -977,7 +984,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -977,7 +984,7 @@ int __video_register_device(struct video_device *vdev,
dev_set_name(&vdev->dev, "%s%d", name_base, vdev->num); dev_set_name(&vdev->dev, "%s%d", name_base, vdev->num);
ret = device_register(&vdev->dev); ret = device_register(&vdev->dev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s: device_register failed\n", __func__); pr_err("%s: device_register failed\n", __func__);
goto cleanup; goto cleanup;
} }
/* Register the release callback that will be called when the last /* Register the release callback that will be called when the last
...@@ -985,7 +992,7 @@ int __video_register_device(struct video_device *vdev, ...@@ -985,7 +992,7 @@ int __video_register_device(struct video_device *vdev,
vdev->dev.release = v4l2_device_release; vdev->dev.release = v4l2_device_release;
if (nr != -1 && nr != vdev->num && warn_if_nr_in_use) if (nr != -1 && nr != vdev->num && warn_if_nr_in_use)
printk(KERN_WARNING "%s: requested %s%d, got %s\n", __func__, pr_warn("%s: requested %s%d, got %s\n", __func__,
name_base, nr, video_device_node_name(vdev)); name_base, nr, video_device_node_name(vdev));
/* Increase v4l2_device refcount */ /* Increase v4l2_device refcount */
...@@ -1043,10 +1050,10 @@ static int __init videodev_init(void) ...@@ -1043,10 +1050,10 @@ static int __init videodev_init(void)
dev_t dev = MKDEV(VIDEO_MAJOR, 0); dev_t dev = MKDEV(VIDEO_MAJOR, 0);
int ret; int ret;
printk(KERN_INFO "Linux video capture interface: v2.00\n"); pr_info("Linux video capture interface: v2.00\n");
ret = register_chrdev_region(dev, VIDEO_NUM_DEVICES, VIDEO_NAME); ret = register_chrdev_region(dev, VIDEO_NUM_DEVICES, VIDEO_NAME);
if (ret < 0) { if (ret < 0) {
printk(KERN_WARNING "videodev: unable to get major %d\n", pr_warn("videodev: unable to get major %d\n",
VIDEO_MAJOR); VIDEO_MAJOR);
return ret; return ret;
} }
...@@ -1054,7 +1061,7 @@ static int __init videodev_init(void) ...@@ -1054,7 +1061,7 @@ static int __init videodev_init(void)
ret = class_register(&video_class); ret = class_register(&video_class);
if (ret < 0) { if (ret < 0) {
unregister_chrdev_region(dev, VIDEO_NUM_DEVICES); unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
printk(KERN_WARNING "video_dev: class_register failed\n"); pr_warn("video_dev: class_register failed\n");
return -EIO; return -EIO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment