summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-11-29 22:36:00 +0300
committerJiri Kosina <jkosina@suse.cz>2019-11-29 22:36:00 +0300
commit09f5429ddf78477b94f1f3c23063b53f127fbbe6 (patch)
treed03d03dfe12b2e7deb55620d903bfdc36ce76eb1
parentb746a1a2860f4a918f32d10dc569115d282aaf2f (diff)
parentb05cec61c703afc64abc42cd79dda8e4ddef7659 (diff)
downloadlinux-09f5429ddf78477b94f1f3c23063b53f127fbbe6.tar.xz
Merge branch 'for-5.5/hidraw' into for-linus
- printk() -> pr_*() cleanup (Rishi Gupta)
-rw-r--r--drivers/hid/hidraw.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index bbc6ec1aa5cb..9432670671fe 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -197,15 +197,15 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t
}
if (count > HID_MAX_BUFFER_SIZE) {
- printk(KERN_WARNING "hidraw: pid %d passed too large report\n",
- task_pid_nr(current));
+ hid_warn(dev, "pid %d passed too large report\n",
+ task_pid_nr(current));
ret = -EINVAL;
goto out;
}
if (count < 2) {
- printk(KERN_WARNING "hidraw: pid %d passed too short report\n",
- task_pid_nr(current));
+ hid_warn(dev, "pid %d passed too short report\n",
+ task_pid_nr(current));
ret = -EINVAL;
goto out;
}
@@ -597,7 +597,7 @@ int __init hidraw_init(void)
if (result < 0)
goto error_class;
- printk(KERN_INFO "hidraw: raw HID events driver (C) Jiri Kosina\n");
+ pr_info("raw HID events driver (C) Jiri Kosina\n");
out:
return result;