From: Simon Glass <sjg@chromium.org>
Date: Mon, 4 Dec 2023 00:29:32 +0000 (-0700)
Subject: x86: zboot: Drop intermediate zboot_setup() function
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=cb19931ee56f52779d6dba97a0934afe97167840;p=u-boot.git

x86: zboot: Drop intermediate zboot_setup() function

Move error checking into the caller so that do_zboot_setup() can call
zboot_setup() directly.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/cmd/x86/zboot.c b/cmd/x86/zboot.c
index d39ab6a969..f392b6b3e4 100644
--- a/cmd/x86/zboot.c
+++ b/cmd/x86/zboot.c
@@ -74,11 +74,10 @@ static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc,
 	return 0;
 }
 
-static int _zboot_setup(void)
+static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
+			  char *const argv[])
 {
-	struct boot_params *base_ptr = state.base_ptr;
-
-	if (!base_ptr) {
+	if (!state.base_ptr) {
 		printf("base is not set: use 'zboot load' first\n");
 		return CMD_RET_FAILURE;
 	}
@@ -87,13 +86,10 @@ static int _zboot_setup(void)
 		return CMD_RET_FAILURE;
 	}
 
-	return 0;
-}
+	if (zboot_setup())
+		return CMD_RET_FAILURE;
 
-static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
-			  char *const argv[])
-{
-	return _zboot_setup();
+	return 0;
 }
 
 static void zboot_info(void)