From patchwork Tue Jun 21 05:32:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 70528 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1837056qgy; Mon, 20 Jun 2016 22:32:59 -0700 (PDT) X-Received: by 10.194.201.102 with SMTP id jz6mr17114317wjc.101.1466487179242; Mon, 20 Jun 2016 22:32:59 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id jq10si33939804wjb.27.2016.06.20.22.32.58; Mon, 20 Jun 2016 22:32:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 73310A76AE; Tue, 21 Jun 2016 07:32:52 +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 TAU2EvEQRfzw; Tue, 21 Jun 2016 07:32:52 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 037C0A76B3; Tue, 21 Jun 2016 07:32:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1A7104BA67 for ; Tue, 21 Jun 2016 07:32:35 +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 a69eCJyuEPqF for ; Tue, 21 Jun 2016 07:32:35 +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 conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 6C2DDA763D for ; Tue, 21 Jun 2016 07:32:32 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id u5L5Va1j023978; Tue, 21 Jun 2016 14:31:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u5L5Va1j023978 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1466487111; bh=Yvg2zRYDgZZ2U7oPALP2cQUzYbv1UvDhouXhwVflKeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NJMBhbsmALk1Shfr+b35MjFD+U4gti81ge8R6VBbsxO8j7B+ftj4HlhxhF9HOPIHF TTcZZLLfumXEjHec29proy4+LiV+VtwkiE+kcKEdMP5gCBiQkr+bekx2LGuzQTeaST Gm4KwtWT5laYLOlxufC6UTwbzBhLlbeYFEorUD3tuOdZmLb5OYGdTywKjqnoKrQlnN xVjgW/CdYDdYAvJLNJzjYbr9yCAs5NQjJXPgtH92P5LsOjKCOq9nr1RF527nxiWoyN JVVV0iRjLyH8BqH3C74LxWJW8FJLlwVjj3QYZDFe0WZUJweA9H4Rl7GU5Yd9gprO8g M2f7L2b8zqwAg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 21 Jun 2016 14:32:47 +0900 Message-Id: <1466487167-18987-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466487167-18987-1-git-send-email-yamada.masahiro@socionext.com> References: <1466487167-18987-1-git-send-email-yamada.masahiro@socionext.com> Cc: Stefan Roese Subject: [U-Boot] [PATCH 6/6] autoboot: move bootdelay >= 0 check to abortboot() 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" Move the bootdelay >= 0 check to the caller, which simplifies the callees. Signed-off-by: Masahiro Yamada --- common/autoboot.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/common/autoboot.c b/common/autoboot.c index 2d19104..528919f 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -187,9 +187,6 @@ static int __abortboot(int bootdelay) int abort; uint64_t etime = endtick(bootdelay); - if (bootdelay < 0) - return 0; - # ifdef CONFIG_AUTOBOOT_PROMPT /* * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards. @@ -219,20 +216,16 @@ static int __abortboot(int bootdelay) #ifdef CONFIG_MENUPROMPT printf(CONFIG_MENUPROMPT); #else - if (bootdelay >= 0) - printf("Hit any key to stop autoboot: %2d ", bootdelay); + printf("Hit any key to stop autoboot: %2d ", bootdelay); #endif /* * Check if key already pressed - * Don't check if bootdelay < 0 */ - if (bootdelay >= 0) { - if (tstc()) { /* we got a key press */ - (void) getc(); /* consume input */ - puts("\b\b\b 0"); - abort = 1; /* don't auto boot */ - } + if (tstc()) { /* we got a key press */ + (void) getc(); /* consume input */ + puts("\b\b\b 0"); + abort = 1; /* don't auto boot */ } while ((bootdelay > 0) && (!abort)) { @@ -264,9 +257,10 @@ static int __abortboot(int bootdelay) static int abortboot(int bootdelay) { - int ret; + int ret = 0; - ret = __abortboot(bootdelay); + if (bootdelay >= 0) + ret = __abortboot(bootdelay); #ifdef CONFIG_SILENT_CONSOLE if (abort)