From c5d257f93f1a20a14ee0e9a236e6160b9d2925aa Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 18 Oct 2015 21:17:21 -0600 Subject: [PATCH] i8042: Adjust keyboard init to assume success Modify i8042_kbd_init() so that the normal pass is sucessful init and failure exits early. This will make the code easier to extend and is easier to read. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- drivers/input/i8042.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 4c887f4071..b1ada867e4 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -585,18 +585,17 @@ int i8042_kbd_init(void) keymap = KBD_GER; } - for (try = 0; try < KBD_RESET_TRIES; try++) { - if (kbd_reset() == 0) { - kbd_mapping = keymap; - kbd_flags = NORMAL; - kbd_state = 0; - kbd_led_set(); - - return 0; - } + for (try = 0; kbd_reset() != 0; try++) { + if (try >= KBD_RESET_TRIES) + return -1; } - return -1; + kbd_mapping = keymap; + kbd_flags = NORMAL; + kbd_state = 0; + kbd_led_set(); + + return 0; } /* -- 2.25.1