Input: i8042 - downgrade selftest error message to dbg()

On a "really fragile" laptop I noticed a single
    i8042.c: i8042 controller selftest failed. (0x1 != 0x55)

error in the log. But there's no reason to print this message at
KERN_ERR level each time that loop fails, especially since the message
telling about the overall selftest failure is printed at KERN_INFO level
(on X86).

Add an actual error message for non-X86 systems, where a selftest
failure is (apparently) more serious. Remove a space in an another error
message.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index ac4c936..d37a48e 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -869,15 +869,15 @@ static int i8042_controller_selftest(void)
        do {
 
                if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-                       pr_err("i8042 controller self test timeout\n");
+                       pr_err("i8042 controller selftest timeout\n");
                        return -ENODEV;
                }
 
                if (param == I8042_RET_CTL_TEST)
                        return 0;
 
-               pr_err("i8042 controller selftest failed. (%#x != %#x)\n",
-                      param, I8042_RET_CTL_TEST);
+               dbg("i8042 controller selftest: %#x != %#x\n",
+                   param, I8042_RET_CTL_TEST);
                msleep(50);
        } while (i++ < 5);
 
@@ -891,6 +891,7 @@ static int i8042_controller_selftest(void)
        pr_info("giving up on controller selftest, continuing anyway...\n");
        return 0;
 #else
+       pr_err("i8042 controller selftest failed\n");
        return -EIO;
 #endif
 }