Merge branch 'for-5.5/hidraw' into for-linus

- printk() -> pr_*() cleanup (Rishi Gupta)
This commit is contained in:
Jiri Kosina 2019-11-29 20:36:00 +01:00
commit 09f5429ddf

View File

@ -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;