]> git.baikalelectronics.ru Git - uboot.git/commitdiff
cmd: fpga: Cleanup error handling in connection to FPGA_NONE
authorMichal Simek <michal.simek@xilinx.com>
Wed, 30 May 2018 08:04:34 +0000 (10:04 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 11 Sep 2018 08:58:41 +0000 (10:58 +0200)
Incorrect command is already handled and FPGA_NONE should be used only
one. In case of error CMD_RET_USAGE can be returned directly without any
addition logic around.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
cmd/fpga.c

index de8505e9d4c83db527f07fdebb4df282076769ef..af2f514dca0000484fdac5b61ff31e8501cf1455 100644 (file)
@@ -171,11 +171,10 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
        if (dev == FPGA_INVALID_DEVICE) {
                puts("FPGA device not specified\n");
-               op = FPGA_NONE;
+               return CMD_RET_USAGE;
        }
 
        switch (op) {
-       case FPGA_NONE:
        case FPGA_INFO:
                break;
 #if defined(CONFIG_CMD_FPGA_LOADFS)
@@ -219,13 +218,10 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
        if (wrong_parms) {
                puts("Wrong parameters for FPGA request\n");
-               op = FPGA_NONE;
+               return CMD_RET_USAGE;
        }
 
        switch (op) {
-       case FPGA_NONE:
-               return CMD_RET_USAGE;
-
        case FPGA_INFO:
                rc = fpga_info(dev);
                break;