From patchwork Wed Oct 18 16:13:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 827705 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yHHL45BYSz9sBd for ; Thu, 19 Oct 2017 03:18:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 72BB6C21ECE; Wed, 18 Oct 2017 16:15:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7A1A6C21EEE; Wed, 18 Oct 2017 16:13:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6530EC21E93; Wed, 18 Oct 2017 16:13:39 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id 60AD0C21EB9 for ; Wed, 18 Oct 2017 16:13:33 +0000 (UTC) Received: from workstation4.fritz.box ([94.114.42.150]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LhwLy-1dQnFu1N9m-00nB78; Wed, 18 Oct 2017 18:13:32 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Wed, 18 Oct 2017 18:13:08 +0200 Message-Id: <20171018161320.7231-7-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171018161320.7231-1-xypron.glpk@gmx.de> References: <20171018161320.7231-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:tNRkFuu+BmF8FESwRj/j3rYiS7cqn7JH7yMuj+yVin29IDfUQgQ xBS71BZhNK52LPS7Gx61y8ipKH8z37VYZXqW8VbpoNhmdNbW6V6k2ywPuYMq7UwrO4s7oGP OXktvzqPavyZUxa688BB0awPAIUXH5S3xrPM8MOovusSmyJG/HFO6BB7U5C+T+VWb9XQWpQ ZxEfX9h4DdwCzbdo2Bk0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:6DSWmqCCgNg=:EVKpK+Q4XXQ49IcD37cNFJ Vjz2iwswQuNyqCvmZkxvHJQ2NsGQrIz2IwGJahOxhJLgmOW6+YAOPDk0bVO1onDTsRSADz5DH hzvruqFhvqB9I/4UQ3ptL0KFLxzSpe3C6G/K+LKKWCpknSDVCm0MfNM5rzLw97JCe3kqZxJs2 qWrg3a6p55Wj8D3LtZ914NXUMt2jws+h7bKgpSWf0llrC4O3GTxXL2OxL+DnTkN82XRiAamHC JmY/MSC25bzrBnLM9FDmwi9KIBTstCMC+BXqO/f8kuBmGTuRXDag052QUZo692XYQPnd0HxHj tDZNPFpyNAwnEKyCBE1J3mD3lnd1UWBCWRCzOFmg6nD6AK5j1s1MVYYVeNIjO81MStPcne+CO XhUX+bjI3a/rAeNnTnAKLdaTSpfI23vGY23kpgD9n7vQwmPXWSJ9/u9+0CSJEO3V0fkGiSaS7 hWX2flLnf2Rg8hZ59t/Z3bJ/uoQxXnns7j/A3tiFNh8qgECxeq9gtvYl1YqaPVIUOi4FWYquA wOelXnPvKHKtaX4xOqbB+jZ3yLZul5h4jdruiPTY+zgraxNogwepchnTv4bMO3QunW0aLgiZK SZRkuOnMn8K4A5U0aQCZ1kzg4KKIFA40BB4HTVR9nOhecU/6Kz/JqyC4rUk9HzgmrBjz6v1H4 prBk9Aee4usVwqQth5NrzYKQrs17KrRjByWWoMSbVABKg5ktv+sTUGX+FQtfZG3OQQE+BEahj 3523Y5vY7KAoQIyh3bZcl9I+j+up/1PugC6Zn8jbbBc3Uiz4YUanzBNl7EAXBN7hUvPG8Nbpy ss7fN6Xp0gc/AFW/0wA2Q5iqApvuQ== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH v4 06/18] efi_loader: consistently use efi_status_t in bootefi X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Where ulong or unsigned long are used to hold an EFI status code we should consistenly use efi_status_t. Signed-off-by: Heinrich Schuchardt --- v4 fix indentation v3 new patch --- cmd/bootefi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 18176a1266..6bdbb89c29 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -93,10 +93,10 @@ static void *copy_fdt(void *fdt) return new_fdt; } -static ulong efi_do_enter(void *image_handle, - struct efi_system_table *st, - asmlinkage ulong (*entry)(void *image_handle, - struct efi_system_table *st)) +static efi_status_t efi_do_enter( + void *image_handle, struct efi_system_table *st, + asmlinkage ulong (*entry)(void *image_handle, + struct efi_system_table *st)) { efi_status_t ret = EFI_LOAD_ERROR; @@ -107,7 +107,7 @@ static ulong efi_do_enter(void *image_handle, } #ifdef CONFIG_ARM64 -static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)( +static efi_status_t efi_run_in_el2(asmlinkage ulong (*entry)( void *image_handle, struct efi_system_table *st), void *image_handle, struct efi_system_table *st) { @@ -122,9 +122,9 @@ static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)( * Load an EFI payload into a newly allocated piece of memory, register all * EFI objects it would want to access and jump to it. */ -static unsigned long do_bootefi_exec(void *efi, void *fdt, - struct efi_device_path *device_path, - struct efi_device_path *image_path) +static efi_status_t do_bootefi_exec(void *efi, void *fdt, + struct efi_device_path *device_path, + struct efi_device_path *image_path) { struct efi_loaded_image loaded_image_info = {}; struct efi_object loaded_image_info_obj = {}; @@ -278,7 +278,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char *saddr, *sfdt; unsigned long addr, fdt_addr = 0; - unsigned long r; + efi_status_t r; if (argc < 2) return CMD_RET_USAGE;