diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-22 08:31:26 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 10:26:14 +0400 |
| commit | 9272e9a2f8872a0f9fb15aaa10f2a993524343e0 (patch) | |
| tree | 83c1d70fde6b05780d264d42c1902a78cfa00a98 /drivers/char | |
| parent | 97f5f0cd8cd0a05449cbb77d1e6f02e026875802 (diff) | |
| download | linux-9272e9a2f8872a0f9fb15aaa10f2a993524343e0.tar.xz | |
Input: keyboard - switch to using pr_err() and friends
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/keyboard.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 50f6c01f44ec..157f23ad434f 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -24,6 +24,8 @@ * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik) */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/consolemap.h> #include <linux/module.h> #include <linux/sched.h> @@ -639,7 +641,7 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag) static void k_lowercase(struct vc_data *vc, unsigned char value, char up_flag) { - printk(KERN_ERR "keyboard.c: k_lowercase was called - impossible\n"); + pr_err("k_lowercase was called - impossible\n"); } static void k_unicode(struct vc_data *vc, unsigned int value, char up_flag) @@ -714,7 +716,7 @@ static void k_fn(struct vc_data *vc, unsigned char value, char up_flag) if (func_table[value]) puts_queue(vc, func_table[value]); } else - printk(KERN_ERR "k_fn called with value=%d\n", value); + pr_err("k_fn called with value=%d\n", value); } static void k_cur(struct vc_data *vc, unsigned char value, char up_flag) @@ -912,7 +914,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag) if (kbd->kbdmode != VC_UNICODE) { if (!up_flag) - printk("keyboard mode must be unicode for braille patterns\n"); + pr_warning("keyboard mode must be unicode for braille patterns\n"); return; } @@ -1169,7 +1171,8 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) if ((raw_mode = (kbd->kbdmode == VC_RAW)) && !hw_raw) if (emulate_raw(vc, keycode, !down << 7)) if (keycode < BTN_MISC && printk_ratelimit()) - printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode); + pr_warning("can't emulate rawmode for keycode %d\n", + keycode); #ifdef CONFIG_SPARC if (keycode == KEY_A && sparc_l1_a_state) { |