diff options
author | YAMANE Toshiaki <yamanetoshi@gmail.com> | 2012-11-08 13:54:54 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-21 16:15:34 -0500 |
commit | 5c77dc40c9fe957220b30c1334d8959be554e1d8 (patch) | |
tree | 2d42ceb35107a7b2bae134786133683e7da75dde /drivers/staging | |
parent | df4f07b5066f3db4270e5b3240fd8292fd28aebb (diff) |
[media] staging/media: Use dev_ or pr_ printks in lirc/lirc_imon.c
fixed below checkpatch warnings.
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
and add pr_fmt.
Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 2944fde89f44..343c622f9387 100644 --- a/drivers/staging/media/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
23 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
24 | #include <linux/init.h> | 26 | #include <linux/init.h> |
25 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
@@ -205,12 +207,12 @@ static void deregister_from_lirc(struct imon_context *context) | |||
205 | 207 | ||
206 | retval = lirc_unregister_driver(minor); | 208 | retval = lirc_unregister_driver(minor); |
207 | if (retval) | 209 | if (retval) |
208 | printk(KERN_ERR KBUILD_MODNAME | 210 | dev_err(&context->usbdev->dev, |
209 | ": %s: unable to deregister from lirc(%d)", | 211 | ": %s: unable to deregister from lirc(%d)", |
210 | __func__, retval); | 212 | __func__, retval); |
211 | else | 213 | else |
212 | printk(KERN_INFO MOD_NAME ": Deregistered iMON driver " | 214 | dev_info(&context->usbdev->dev, |
213 | "(minor:%d)\n", minor); | 215 | "Deregistered iMON driver (minor:%d)\n", minor); |
214 | 216 | ||
215 | } | 217 | } |
216 | 218 | ||
@@ -231,8 +233,7 @@ static int display_open(struct inode *inode, struct file *file) | |||
231 | subminor = iminor(inode); | 233 | subminor = iminor(inode); |
232 | interface = usb_find_interface(&imon_driver, subminor); | 234 | interface = usb_find_interface(&imon_driver, subminor); |
233 | if (!interface) { | 235 | if (!interface) { |
234 | printk(KERN_ERR KBUILD_MODNAME | 236 | pr_err("%s: could not find interface for minor %d\n", |
235 | ": %s: could not find interface for minor %d\n", | ||
236 | __func__, subminor); | 237 | __func__, subminor); |
237 | retval = -ENODEV; | 238 | retval = -ENODEV; |
238 | goto exit; | 239 | goto exit; |
@@ -282,8 +283,7 @@ static int display_close(struct inode *inode, struct file *file) | |||
282 | context = file->private_data; | 283 | context = file->private_data; |
283 | 284 | ||
284 | if (!context) { | 285 | if (!context) { |
285 | printk(KERN_ERR KBUILD_MODNAME | 286 | pr_err("%s: no context for device\n", __func__); |
286 | "%s: no context for device\n", __func__); | ||
287 | return -ENODEV; | 287 | return -ENODEV; |
288 | } | 288 | } |
289 | 289 | ||
@@ -391,8 +391,7 @@ static ssize_t vfd_write(struct file *file, const char __user *buf, | |||
391 | 391 | ||
392 | context = file->private_data; | 392 | context = file->private_data; |
393 | if (!context) { | 393 | if (!context) { |
394 | printk(KERN_ERR KBUILD_MODNAME | 394 | pr_err("%s: no context for device\n", __func__); |
395 | "%s: no context for device\n", __func__); | ||
396 | return -ENODEV; | 395 | return -ENODEV; |
397 | } | 396 | } |
398 | 397 | ||
@@ -521,8 +520,7 @@ static void ir_close(void *data) | |||
521 | 520 | ||
522 | context = (struct imon_context *)data; | 521 | context = (struct imon_context *)data; |
523 | if (!context) { | 522 | if (!context) { |
524 | printk(KERN_ERR KBUILD_MODNAME | 523 | pr_err("%s: no context for device\n", __func__); |
525 | "%s: no context for device\n", __func__); | ||
526 | return; | 524 | return; |
527 | } | 525 | } |
528 | 526 | ||
@@ -1009,8 +1007,8 @@ static void imon_disconnect(struct usb_interface *interface) | |||
1009 | 1007 | ||
1010 | mutex_unlock(&driver_lock); | 1008 | mutex_unlock(&driver_lock); |
1011 | 1009 | ||
1012 | printk(KERN_INFO "%s: iMON device (intf%d) disconnected\n", | 1010 | dev_info(&interface->dev, "%s: iMON device (intf%d) disconnected\n", |
1013 | __func__, ifnum); | 1011 | __func__, ifnum); |
1014 | } | 1012 | } |
1015 | 1013 | ||
1016 | static int imon_suspend(struct usb_interface *intf, pm_message_t message) | 1014 | static int imon_suspend(struct usb_interface *intf, pm_message_t message) |