summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-10-19 03:17:20 (GMT)
committerSimon Glass <sjg@chromium.org>2015-11-20 03:13:40 (GMT)
commit4f087bace2dab1ceb42077a044c918e22691a172 (patch)
treeeff13b8b418c7b7707128282868bd7d6d7babe3a /drivers/input
parent31d38ee66dfad4284866267ff0651fa0614dad3c (diff)
downloadu-boot-4f087bace2dab1ceb42077a044c918e22691a172.tar.xz
i8042: Adjust kbd_reset() to collect all failures
Rather than lots of 'return' statements, use goto to a single return. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/i8042.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index dbd4b00..4c887f4 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -485,30 +485,33 @@ static int kbd_reset(void)
/* controller self test */
if (kbd_cmd_read(CMD_SELF_TEST) != KBC_TEST_OK)
- return -1;
+ goto err;
/* keyboard reset */
if (kbd_write(I8042_DATA_REG, CMD_RESET_KBD) ||
kbd_read(I8042_DATA_REG) != KBD_ACK ||
kbd_read(I8042_DATA_REG) != KBD_POR)
- return -1;
+ goto err;
/* set AT translation and disable irq */
config = kbd_cmd_read(CMD_RD_CONFIG);
if (config == -1)
- return -1;
+ goto err;
config |= CONFIG_AT_TRANS;
config &= ~(CONFIG_KIRQ_EN | CONFIG_MIRQ_EN);
if (kbd_cmd_write(CMD_WR_CONFIG, config))
- return -1;
+ goto err;
/* enable keyboard */
if (kbd_write(I8042_CMD_REG, CMD_KBD_EN) ||
!kbd_input_empty())
- return -1;
+ goto err;
return 0;
+err:
+ debug("%s: Keyboard failure\n", __func__);
+ return -1;
}
static int kbd_controller_present(void)