From patchwork Thu Jun 23 15:42:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 70764 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp496924qgy; Thu, 23 Jun 2016 08:43:31 -0700 (PDT) X-Received: by 10.28.157.1 with SMTP id g1mr14549669wme.34.1466696611340; Thu, 23 Jun 2016 08:43:31 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id 137si7170112wms.63.2016.06.23.08.43.31; Thu, 23 Jun 2016 08:43:31 -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 C3C10A753B; Thu, 23 Jun 2016 17:43:25 +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 0cSGb70ztlP6; Thu, 23 Jun 2016 17:43:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 609CEA74F9; Thu, 23 Jun 2016 17:43:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A36FDA75B9 for ; Thu, 23 Jun 2016 17:43:22 +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 x2RgzWAhckxO for ; Thu, 23 Jun 2016 17:43:22 +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-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by theia.denx.de (Postfix) with ESMTPS id DF2ABA74F9 for ; Thu, 23 Jun 2016 17:43:19 +0200 (CEST) Received: from grover.sesame (FL1-119-242-215-193.osk.mesh.ad.jp [119.242.215.193]) (authenticated) by conuserg-10.nifty.com with ESMTP id u5NFggq1027414; Fri, 24 Jun 2016 00:42:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u5NFggq1027414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1466696577; bh=B6/u0DT8o5H096fEY+FsCQl5TvasBmWaOCkmBd3U5d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HynjtZp5JJyxJnkF0X1jJXLFIqeikA8PrJImtEfCvFpEs6afsHSzw6eyFgTjdVMa0 TCvwHTVc5Y5E0iiPEgU98aVrHTH6XNL0lOMUsMaVOWv4Ss1PTMLwQZbK8GqrzdLH72 Wk1hCyc0LFRNaE99mdYyvIGnTFQGR92bnWI7d861lfW7rP3GClGCRa26ObI1VLJq1g 1+FIFf6h3taOhEp+KKSYPMKw74oP2zWSKAR3nvPqQlVLWHZCn48hCCUf4aYJDx2Vph UOrclqUsu0Uya7paPbheeO76lW1BUL561KR2UJ6Jwi6eUtg6U+aGFavly6iJL9JyYw JqjhWDuL+7lTQ== X-Nifty-SrcIP: [119.242.215.193] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 24 Jun 2016 00:42:39 +0900 Message-Id: <1466696561-22935-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466696561-22935-1-git-send-email-yamada.masahiro@socionext.com> References: <1466696561-22935-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v2 4/6] autoboot: rename abortboot_{keyed, normal} 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" 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 --- Changes in v2: None common/autoboot.c | 10 +++------- 1 file changed, 3 insertions(+), 7 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 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)