Commit 09f5429d authored by Jiri Kosina's avatar Jiri Kosina

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

- printk() -> pr_*() cleanup (Rishi Gupta)
parents b746a1a2 b05cec61
...@@ -197,14 +197,14 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t ...@@ -197,14 +197,14 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t
} }
if (count > HID_MAX_BUFFER_SIZE) { if (count > HID_MAX_BUFFER_SIZE) {
printk(KERN_WARNING "hidraw: pid %d passed too large report\n", hid_warn(dev, "pid %d passed too large report\n",
task_pid_nr(current)); task_pid_nr(current));
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (count < 2) { if (count < 2) {
printk(KERN_WARNING "hidraw: pid %d passed too short report\n", hid_warn(dev, "pid %d passed too short report\n",
task_pid_nr(current)); task_pid_nr(current));
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
...@@ -597,7 +597,7 @@ int __init hidraw_init(void) ...@@ -597,7 +597,7 @@ int __init hidraw_init(void)
if (result < 0) if (result < 0)
goto error_class; 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: out:
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment