Re: [U-Boot] [PATCH 6/6] autoboot: move bootdelay >= 0 check to abortboot()

[Heiko Schocher]

Hello Masahiro,

Am 21.06.2016 um 07:32 schrieb Masahiro Yamada:

Move the bootdelay >= 0 check to the caller, which simplifies
the callees.

Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
---

  common/autoboot.c | 22 ++++++++--------------
  1 file changed, 8 insertions(+), 14 deletions(-)

Thanks!

Reviewed-by: Heiko Schocher <h...@denx.de>

bye,
Heiko

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)

--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot