evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] staging/media: Use dev_ or pr_ printks in lirc/lirc_imon.c

Browse source 
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>
This commit is contained in:
YAMANE Toshiaki 2012-11-08 15:54:54 -03:00 • committed by Mauro Carvalho Chehab
parent df4f07b506
commit 5c77dc40c9
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/media/lirc/lirc_imon.c
View file

@ -20,6 +20,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -205,12 +207,12 @@ static void deregister_from_lirc(struct imon_context *context)
retval = lirc_unregister_driver(minor); retval = lirc_unregister_driver(minor);
if (retval) if (retval)
printk(KERN_ERR KBUILD_MODNAME dev_err(&context->usbdev->dev,
": %s: unable to deregister from lirc(%d)", ": %s: unable to deregister from lirc(%d)",
__func__, retval); __func__, retval);
else else
printk(KERN_INFO MOD_NAME ": Deregistered iMON driver " dev_info(&context->usbdev->dev,
"(minor:%d)\n", minor); "Deregistered iMON driver (minor:%d)\n", minor);
} }
@ -231,8 +233,7 @@ static int display_open(struct inode *inode, struct file *file)
subminor = iminor(inode); subminor = iminor(inode);
interface = usb_find_interface(&imon_driver, subminor); interface = usb_find_interface(&imon_driver, subminor);
if (!interface) { if (!interface) {
printk(KERN_ERR KBUILD_MODNAME pr_err("%s: could not find interface for minor %d\n",
": %s: could not find interface for minor %d\n",
__func__, subminor); __func__, subminor);
retval = -ENODEV; retval = -ENODEV;
goto exit; goto exit;
@ -282,8 +283,7 @@ static int display_close(struct inode *inode, struct file *file)
context = file->private_data; context = file->private_data;
if (!context) { if (!context) {
printk(KERN_ERR KBUILD_MODNAME pr_err("%s: no context for device\n", __func__);
"%s: no context for device\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -391,8 +391,7 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
context = file->private_data; context = file->private_data;
if (!context) { if (!context) {
printk(KERN_ERR KBUILD_MODNAME pr_err("%s: no context for device\n", __func__);
"%s: no context for device\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -521,8 +520,7 @@ static void ir_close(void *data)
context = (struct imon_context *)data; context = (struct imon_context *)data;
if (!context) { if (!context) {
printk(KERN_ERR KBUILD_MODNAME pr_err("%s: no context for device\n", __func__);
"%s: no context for device\n", __func__);
return; return;
} }
@ -1009,8 +1007,8 @@ static void imon_disconnect(struct usb_interface *interface)
mutex_unlock(&driver_lock); mutex_unlock(&driver_lock);
printk(KERN_INFO "%s: iMON device (intf%d) disconnected\n", dev_info(&interface->dev, "%s: iMON device (intf%d) disconnected\n",
__func__, ifnum); __func__, ifnum);
} }
static int imon_suspend(struct usb_interface *intf, pm_message_t message) static int imon_suspend(struct usb_interface *intf, pm_message_t message)