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 d39ab6a9698f66ade0910cb5e61e4885ea028ab8..f392b6b3e4931bf109e329a968619f3b1691ab97 100644 (file)
--- 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)