tty: pr_warning->pr_warn and logging neatening

Convert the pr_warning to the more common pr_warn.

Other miscellanea:

o Convert unusual PR_FMT define and uses to pr_fmt
o Remove unnecessary OOM message
o Fix grammar in an error message
o Convert a pr_warning with a KERN_ERR to pr_err

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index c039cfea5b11..8a89f6e7715d 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -924,7 +924,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
 
         if (kbd->kbdmode != VC_UNICODE) {
                 if (!up_flag)
-                        pr_warning("keyboard mode must be unicode for braille patterns\n");
+                        pr_warn("keyboard mode must be unicode for braille patterns\n");
                 return;
         }
 
@@ -1253,8 +1253,8 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
         if (raw_mode && !hw_raw)
                 if (emulate_raw(vc, keycode, !down << 7))
                         if (keycode < BTN_MISC && printk_ratelimit())
-                                pr_warning("can't emulate rawmode for keycode %d\n",
-                                           keycode);
+                                pr_warn("can't emulate rawmode for keycode %d\n",
+                                        keycode);
 
 #ifdef CONFIG_SPARC
         if (keycode == KEY_A && sparc_l1_a_state) {
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index ed0136519422..f3fbbbca9bde 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3855,8 +3855,8 @@ void do_unblank_screen(int leaving_gfx)
                 return;
         if (!vc_cons_allocated(fg_console)) {
                 /* impossible */
-                pr_warning("unblank_screen: tty %d not allocated ??\n",
-                           fg_console+1);
+                pr_warn("unblank_screen: tty %d not allocated ??\n",
+                        fg_console + 1);
                 return;
         }
         vc = vc_cons[fg_console].d;