From: Masahiro Yamada Date: Mon, 27 Jun 2016 07:23:02 +0000 (+0900) Subject: autoboot: rename abortboot_{keyed, normal} to __abortboot X-Git-Tag: v2016.07-rc3~6 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8da8298ad9b5a379d6fb7f079a3a1a591147a5e;p=oweals%2Fu-boot.git autoboot: rename abortboot_{keyed, normal} to __abortboot 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 Reviewed-by: Stefan Roese Reviewed-by: Simon Glass Reviewed-by: Heiko Schocher --- diff --git a/common/autoboot.c b/common/autoboot.c index 35deece7f7..eb31c8875d 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)