diff options
author | Joe Perches <joe@perches.com> | 2010-11-30 02:33:07 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-01 02:10:26 -0500 |
commit | da0c490115de026618a7fdcd886602da44392a50 (patch) | |
tree | b61dae8d525fa765151adb8df5456a1e9880a773 /drivers/input/evdev.c | |
parent | 4eb3c30b2e034b673df3e8f21b497e39f3911a02 (diff) |
Input: use pr_fmt and pr_<level>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r-- | drivers/input/evdev.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index e3f7fc6f9565..17660b1c8591 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -8,6 +8,8 @@ | |||
8 | * the Free Software Foundation. | 8 | * the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
12 | |||
11 | #define EVDEV_MINOR_BASE 64 | 13 | #define EVDEV_MINOR_BASE 64 |
12 | #define EVDEV_MINORS 32 | 14 | #define EVDEV_MINORS 32 |
13 | #define EVDEV_MIN_BUFFER_SIZE 64U | 15 | #define EVDEV_MIN_BUFFER_SIZE 64U |
@@ -522,12 +524,11 @@ static int handle_eviocgbit(struct input_dev *dev, | |||
522 | if (type == EV_KEY && size == OLD_KEY_MAX) { | 524 | if (type == EV_KEY && size == OLD_KEY_MAX) { |
523 | len = OLD_KEY_MAX; | 525 | len = OLD_KEY_MAX; |
524 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) | 526 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) |
525 | printk(KERN_WARNING | 527 | pr_warning("(EVIOCGBIT): Suspicious buffer size %u, " |
526 | "evdev.c(EVIOCGBIT): Suspicious buffer size %u, " | 528 | "limiting output to %zu bytes. See " |
527 | "limiting output to %zu bytes. See " | 529 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", |
528 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", | 530 | OLD_KEY_MAX, |
529 | OLD_KEY_MAX, | 531 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); |
530 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); | ||
531 | } | 532 | } |
532 | 533 | ||
533 | return bits_to_user(bits, len, size, p, compat_mode); | 534 | return bits_to_user(bits, len, size, p, compat_mode); |
@@ -894,7 +895,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, | |||
894 | break; | 895 | break; |
895 | 896 | ||
896 | if (minor == EVDEV_MINORS) { | 897 | if (minor == EVDEV_MINORS) { |
897 | printk(KERN_ERR "evdev: no more free evdev devices\n"); | 898 | pr_err("no more free evdev devices\n"); |
898 | return -ENFILE; | 899 | return -ENFILE; |
899 | } | 900 | } |
900 | 901 | ||