From patchwork Mon Oct 19 03:17:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 532096 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C385A140134 for ; Mon, 19 Oct 2015 14:19:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=bUaxo76u; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A56B4B7EA; Mon, 19 Oct 2015 05:19:14 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lx3S4qbu-rYq; Mon, 19 Oct 2015 05:19:14 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5AEFA4B7EB; Mon, 19 Oct 2015 05:18:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 29CC44B78B for ; Mon, 19 Oct 2015 05:18:01 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PMl23hzspw3B for ; Mon, 19 Oct 2015 05:18:01 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f175.google.com (mail-ig0-f175.google.com [209.85.213.175]) by theia.denx.de (Postfix) with ESMTPS id 7C1684B6EF for ; Mon, 19 Oct 2015 05:17:51 +0200 (CEST) Received: by igbkq10 with SMTP id kq10so47772570igb.0 for ; Sun, 18 Oct 2015 20:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z7Eu3VPq5FItremdjRucOCaj+wXWNhqm9O5DsGmclws=; b=bUaxo76uMj5vEI98Wxd3RCXO1IaUifzhudrJisH+57Vem244BU+f1+OAfzQa2zXHaO hua9fQTUsRe1bz6JgP9d7H0sFwOFZwKm0hs8RDlBYXOQb/Mbdz5XL2lBSu0VPMc1Z9vn HVKbQXbhkVhytjVLnn/s0yOz907quRRUrEwSaI7FWZX6sITpbr7MmWulHcP5nCTLzQK2 A2gCounxxOXO48gPPsM+lG2C9VR0t212oR7nUgwYsDtzlDCINJwTXghPk8eOREy9IAsw OSlFpwYRkFKzJKrKKbU5nuEqktoFPcrsSnC+vUxLTluP2rGdHD2AEIxxsjBHnBdWd01E b36Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Z7Eu3VPq5FItremdjRucOCaj+wXWNhqm9O5DsGmclws=; b=Xd5esHEOy+LS9ExnIksW6mgRloHKr9wkLzgZEwQ9Fcl2RYalPZiA1I6xOtHjmb3W9B otRlGXbt8vJ4q5YF1FQ7KLaiByqgPsNcivMJHX6Irj59XUaHijWjTnA21dmCgRJDJIZd XBIZ15z5Xc7jVaR63CaMxaS7oPkCug3urPJhnQ33pghKbPEBwQlVw5aPQSOhKXyz/+ud mt2VzHHdjp7D9E6PRlzPOhsrZvPyJwfS6BohoRWUC3ZHM4637VAThYNIqygUdumxaJ7J 4Bkjc8PFlKQ5/67qNqnFhMg0Q1KsIk9RZ9RjJkue4mYQCZnfuwoD+khu2k5/9eIcafSV CMMg== X-Gm-Message-State: ALoCoQkWfKOe6yjX+7bn3kOVsq0B0Tq41CqeiBXgoS6LGv+HvUT0cmD6FmnUuMuFFwkV4nDWbAzt X-Received: by 10.50.66.141 with SMTP id f13mr16040742igt.51.1445224669963; Sun, 18 Oct 2015 20:17:49 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id hh9sm7137744igb.18.2015.10.18.20.17.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Oct 2015 20:17:46 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 90CA62233EF; Sun, 18 Oct 2015 21:17:44 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Oct 2015 21:17:21 -0600 Message-Id: <1445224657-20622-13-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445224657-20622-1-git-send-email-sjg@chromium.org> References: <1445224657-20622-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 12/28] i8042: Adjust keyboard init to assume success X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 --- Changes in v2: None 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 4c887f4..b1ada86 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; } /*