From mboxrd@z Thu Jan  1 00:00:00 1970
From: Heiko Schocher <hs@denx.de>
Date: Wed, 22 Jun 2016 07:51:18 +0200
Subject: [U-Boot] [PATCH 4/6] autoboot: rename abortboot_{keyed,
 normal} to __abortboot
In-Reply-To: <1466487167-18987-5-git-send-email-yamada.masahiro@socionext.com>
References: <1466487167-18987-1-git-send-email-yamada.masahiro@socionext.com>
 <1466487167-18987-5-git-send-email-yamada.masahiro@socionext.com>
Message-ID: <576A2756.7000809@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hello Masahiro,

Am 21.06.2016 um 07:32 schrieb Masahiro Yamada:
> Because abortboot_keyed() and abortboot_normal() are not compiled
> at the same time, we can rename both of them to __abortboot().
> This allows to drop #ifdef from the caller.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>   common/autoboot.c | 10 +++-------
>   1 file changed, 3 insertions(+), 7 deletions(-)

Thanks!

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

bye,
Heiko
>
> diff --git a/common/autoboot.c b/common/autoboot.c
> index 35deece..eb31c88 100644
> --- a/common/autoboot.c
> +++ b/common/autoboot.c
> @@ -182,7 +182,7 @@ static int passwd_abort(uint64_t etime)
>    * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
>    * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
>    */
> -static int abortboot_keyed(int bootdelay)
> +static int __abortboot(int bootdelay)
>   {
>   	int abort;
>   	uint64_t etime = endtick(bootdelay);
> @@ -216,7 +216,7 @@ static int abortboot_keyed(int bootdelay)
>   static int menukey;
>   #endif
>
> -static int abortboot_normal(int bootdelay)
> +static int __abortboot(int bootdelay)
>   {
>   	int abort = 0;
>   	unsigned long ts;
> @@ -274,11 +274,7 @@ static int abortboot_normal(int bootdelay)
>
>   static int abortboot(int bootdelay)
>   {
> -#ifdef CONFIG_AUTOBOOT_KEYED
> -	return abortboot_keyed(bootdelay);
> -#else
> -	return abortboot_normal(bootdelay);
> -#endif
> +	return __abortboot(bootdelay);
>   }
>
>   static void process_fdt_options(const void *blob)
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany