Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / m68k / atari / atakeyb.c

diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 264db11268039329266ef1a910e8de964f396a72..37091898adb3d3b54249df3f50558337d72ce751 100644 (file)
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -149,7 +149,7 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
        if (acia_stat & ACIA_OVRN) {
                /* a very fast typist or a slow system, give a warning */
                /* ...happens often if interrupts were disabled for too long */
-               printk(KERN_DEBUG "Keyboard overrun\n");
+               pr_debug("Keyboard overrun\n");
                scancode = acia.key_data;
                if (ikbd_self_test)
                        /* During self test, don't do resyncing, just process the code */
@@ -228,14 +228,14 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
                                        keytyp = KTYP(keyval) - 0xf0;
                                        keyval = KVAL(keyval);
 
-                                       printk(KERN_WARNING "Key with scancode %d ", scancode);
+                                       pr_warn("Key with scancode %d ", scancode);
                                        if (keytyp == KT_LATIN || keytyp == KT_LETTER) {
                                                if (keyval < ' ')
-                                                       printk("('^%c') ", keyval + '@');
+                                                       pr_cont("('^%c') ", keyval + '@');
                                                else
-                                                       printk("('%c') ", keyval);
+                                                       pr_cont("('%c') ", keyval);
                                        }
-                                       printk("is broken -- will be ignored.\n");
+                                       pr_cont("is broken -- will be ignored.\n");
                                        break;
                                } else if (test_bit(scancode, broken_keys))
                                        break;
@@ -299,7 +299,7 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
 #endif
 
        if (acia_stat & (ACIA_FE | ACIA_PE)) {
-               printk("Error in keyboard communication\n");
+               pr_err("Error in keyboard communication\n");
        }
 
        /* handle_scancode() can take a lot of time, so check again if
@@ -553,7 +553,7 @@ int atari_keyb_init(void)
                barrier();
        /* if not incremented: no 0xf1 received */
        if (ikbd_self_test == 1)
-               printk(KERN_ERR "WARNING: keyboard self test failed!\n");
+               pr_err("Keyboard self test failed!\n");
        ikbd_self_test = 0;
 
        ikbd_mouse_disable();