From patchwork Mon Jun 27 07:23:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 70896 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp932744qgy; Mon, 27 Jun 2016 00:22:37 -0700 (PDT) X-Received: by 10.194.34.202 with SMTP id b10mr15442267wjj.47.1467012157546; Mon, 27 Jun 2016 00:22:37 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id e83si12238997wmi.88.2016.06.27.00.22.37; Mon, 27 Jun 2016 00:22:37 -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 EFD73A75E9; Mon, 27 Jun 2016 09:22:36 +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 XNLc_UZCF_vT; Mon, 27 Jun 2016 09:22:36 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DD4EA7548; Mon, 27 Jun 2016 09:22:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA46FA75E6 for ; Mon, 27 Jun 2016 09:22:31 +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 BQ_JAr1g0Qpd for ; Mon, 27 Jun 2016 09:22:31 +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-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by theia.denx.de (Postfix) with ESMTPS id 2CE75A7548 for ; Mon, 27 Jun 2016 09:22:29 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id u5R7Lfal007984; Mon, 27 Jun 2016 16:21:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u5R7Lfal007984 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1467012116; bh=jknJTqKG8eQ/DduPv7vhzIQOmZdEuyQVNZm66XR3mMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gfYQq1LM07K5cHKZBhJJAygjBR9YcnUTaMb75rEqJNO8pMugd+cBvXcLw0sNDoks4 hAyiZX7gH+y+WqOgtN4Ewwx0KWWA15mZqG3dzgA95iqa3ZtDI4XPjcMbaiBrUsNdLg DKlLORAsJrPfEO9w7rOt816n3aWAM0wEdoi1i4nfkJQfdIhvF3CGatc+RaD5ltHTEP jB4fJrGhazCyI+Hwob2YO6cJ3/NBIwrDtBgKP22WzsS1decErxeJ4Z8HEg3e2ou0V+ 2s8uBaQfQa4sp1hi1gBi/+lLdW+s15Hg4Jg2tbgm890/fiYFNn8ihHg+kc1EhRb9WH 53Z67DgvQJs9A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 27 Jun 2016 16:23:04 +0900 Message-Id: <1467012184-3231-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467012184-3231-1-git-send-email-yamada.masahiro@socionext.com> References: <1467012184-3231-1-git-send-email-yamada.masahiro@socionext.com> Cc: Stefan Roese Subject: [U-Boot] [PATCH v3 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 Reviewed-by: Stefan Roese Reviewed-by: Simon Glass Reviewed-by: Heiko Schocher --- Changes in v3: None Changes in v2: None 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 fb13139..c52bad8 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 abort; + int abort = 0; - abort = __abortboot(bootdelay); + if (bootdelay >= 0) + abort = __abortboot(bootdelay); #ifdef CONFIG_SILENT_CONSOLE if (abort)