diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-09-24 07:26:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-27 13:19:23 -0400 |
commit | 3c16b2b330e33392ad5dbd98e64bab659259daa4 (patch) | |
tree | 98fb0ee4037beef50a0f6de899ef2f62f6092c14 /drivers/media/media-devnode.c | |
parent | 0bd0dbee3f49c46ba860f21f97a98ac64781be5d (diff) |
[media] media-devnode: Replace printk with pr_*
Fixes checkpatch warnings related to printk.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/media-devnode.c')
-rw-r--r-- | drivers/media/media-devnode.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c index f6b52d549430..023b2a1cbb9b 100644 --- a/drivers/media/media-devnode.c +++ b/drivers/media/media-devnode.c | |||
@@ -30,6 +30,8 @@ | |||
30 | * counting. | 30 | * counting. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
34 | |||
33 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
34 | #include <linux/init.h> | 36 | #include <linux/init.h> |
35 | #include <linux/module.h> | 37 | #include <linux/module.h> |
@@ -215,7 +217,7 @@ int __must_check media_devnode_register(struct media_devnode *mdev) | |||
215 | minor = find_next_zero_bit(media_devnode_nums, MEDIA_NUM_DEVICES, 0); | 217 | minor = find_next_zero_bit(media_devnode_nums, MEDIA_NUM_DEVICES, 0); |
216 | if (minor == MEDIA_NUM_DEVICES) { | 218 | if (minor == MEDIA_NUM_DEVICES) { |
217 | mutex_unlock(&media_devnode_lock); | 219 | mutex_unlock(&media_devnode_lock); |
218 | printk(KERN_ERR "could not get a free minor\n"); | 220 | pr_err("could not get a free minor\n"); |
219 | return -ENFILE; | 221 | return -ENFILE; |
220 | } | 222 | } |
221 | 223 | ||
@@ -230,7 +232,7 @@ int __must_check media_devnode_register(struct media_devnode *mdev) | |||
230 | 232 | ||
231 | ret = cdev_add(&mdev->cdev, MKDEV(MAJOR(media_dev_t), mdev->minor), 1); | 233 | ret = cdev_add(&mdev->cdev, MKDEV(MAJOR(media_dev_t), mdev->minor), 1); |
232 | if (ret < 0) { | 234 | if (ret < 0) { |
233 | printk(KERN_ERR "%s: cdev_add failed\n", __func__); | 235 | pr_err("%s: cdev_add failed\n", __func__); |
234 | goto error; | 236 | goto error; |
235 | } | 237 | } |
236 | 238 | ||
@@ -243,7 +245,7 @@ int __must_check media_devnode_register(struct media_devnode *mdev) | |||
243 | dev_set_name(&mdev->dev, "media%d", mdev->minor); | 245 | dev_set_name(&mdev->dev, "media%d", mdev->minor); |
244 | ret = device_register(&mdev->dev); | 246 | ret = device_register(&mdev->dev); |
245 | if (ret < 0) { | 247 | if (ret < 0) { |
246 | printk(KERN_ERR "%s: device_register failed\n", __func__); | 248 | pr_err("%s: device_register failed\n", __func__); |
247 | goto error; | 249 | goto error; |
248 | } | 250 | } |
249 | 251 | ||
@@ -287,18 +289,18 @@ static int __init media_devnode_init(void) | |||
287 | { | 289 | { |
288 | int ret; | 290 | int ret; |
289 | 291 | ||
290 | printk(KERN_INFO "Linux media interface: v0.10\n"); | 292 | pr_info("Linux media interface: v0.10\n"); |
291 | ret = alloc_chrdev_region(&media_dev_t, 0, MEDIA_NUM_DEVICES, | 293 | ret = alloc_chrdev_region(&media_dev_t, 0, MEDIA_NUM_DEVICES, |
292 | MEDIA_NAME); | 294 | MEDIA_NAME); |
293 | if (ret < 0) { | 295 | if (ret < 0) { |
294 | printk(KERN_WARNING "media: unable to allocate major\n"); | 296 | pr_warn("unable to allocate major\n"); |
295 | return ret; | 297 | return ret; |
296 | } | 298 | } |
297 | 299 | ||
298 | ret = bus_register(&media_bus_type); | 300 | ret = bus_register(&media_bus_type); |
299 | if (ret < 0) { | 301 | if (ret < 0) { |
300 | unregister_chrdev_region(media_dev_t, MEDIA_NUM_DEVICES); | 302 | unregister_chrdev_region(media_dev_t, MEDIA_NUM_DEVICES); |
301 | printk(KERN_WARNING "media: bus_register failed\n"); | 303 | pr_warn("bus_register failed\n"); |
302 | return -EIO; | 304 | return -EIO; |
303 | } | 305 | } |
304 | 306 | ||