From a5eabd82d0a7fa62e5bf549686ae13548a33e750 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Thu, 8 Nov 2012 15:53:53 -0300 Subject: [PATCH] --- yaml --- r: 357116 b: refs/heads/master c: ce24c25b97b26c3f5a1634b2919b50a053eabc01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/lirc/lirc_igorplugusb.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fad56d736e4e..0df3ea1110a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c77dc40c9fe957220b30c1334d8959be554e1d8 +refs/heads/master: ce24c25b97b26c3f5a1634b2919b50a053eabc01 diff --git a/trunk/drivers/staging/media/lirc/lirc_igorplugusb.c b/trunk/drivers/staging/media/lirc/lirc_igorplugusb.c index 939a801c23e4..2faa391006db 100644 --- a/trunk/drivers/staging/media/lirc/lirc_igorplugusb.c +++ b/trunk/drivers/staging/media/lirc/lirc_igorplugusb.c @@ -223,8 +223,8 @@ static int unregister_from_lirc(struct igorplug *ir) int devnum; if (!ir) { - printk(KERN_ERR "%s: called with NULL device struct!\n", - __func__); + dev_err(&ir->usbdev->dev, + "%s: called with NULL device struct!\n", __func__); return -EINVAL; } @@ -232,8 +232,8 @@ static int unregister_from_lirc(struct igorplug *ir) d = ir->d; if (!d) { - printk(KERN_ERR "%s: called with NULL lirc driver struct!\n", - __func__); + dev_err(&ir->usbdev->dev, + "%s: called with NULL lirc driver struct!\n", __func__); return -EINVAL; } @@ -347,8 +347,8 @@ static int igorplugusb_remote_poll(void *data, struct lirc_buffer *buf) if (ir->buf_in[2] == 0) send_fragment(ir, buf, DEVICE_HEADERLEN, ret); else { - printk(KERN_WARNING DRIVER_NAME - "[%d]: Device buffer overrun.\n", ir->devnum); + dev_warn(&ir->usbdev->dev, + "[%d]: Device buffer overrun.\n", ir->devnum); /* HHHNNNNNNNNNNNOOOOOOOO H = header <---[2]---> N = newer <---------ret--------> O = older */