cmd: fpga: Clean wrong_parms handling

There is no reason to check parameters in separate switch. Check them
directly when they are read. Also there is no reason to check loadmk
case separately because fpga_data address must be non zero too.

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

diff --git a/cmd/fpga.c b/cmd/fpga.c
index b03dd9dc0aceb25eab7fb81e41e966b51f2328f3..0e5f4117c02e878c9136094ea00c6ed6f45dd7e7 100644 (file)
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -83,7 +83,6 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        char *devstr = env_get("fpga");
        char *datastr = env_get("fpgadata");
        int rc = FPGA_FAIL;
-       int wrong_parms = 0;
 #if defined(CONFIG_FIT)
        const char *fit_uname = NULL;
        ulong fit_addr;
@@ -160,7 +159,10 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        switch (argc) {
        case 5:         /* fpga <op> <dev> <data> <datasize> */
                data_size = simple_strtoul(argv[4], NULL, 16);
-
+               if (!data_size) {
+                       puts("Zero data_size\n");
+                       return CMD_RET_USAGE;
+               }
        case 4:         /* fpga <op> <dev> <data> */
 #if defined(CONFIG_FIT)
                if (fit_parse_subimage(argv[3], (ulong)fpga_data,
@@ -177,7 +179,10 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                              (ulong)fpga_data);
                }
                debug("%s: fpga_data = 0x%lx\n", __func__, (ulong)fpga_data);
-
+               if (!fpga_data) {
+                       puts("Zero fpga_data address\n");
+                       return CMD_RET_USAGE;
+               }
        case 3:         /* fpga <op> <dev | data addr> */
                dev = (int)simple_strtoul(argv[2], NULL, 16);
                debug("%s: device = %d\n", __func__, dev);
@@ -188,30 +193,6 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                return CMD_RET_USAGE;
        }
 
-       switch (op) {
-       case FPGA_INFO:
-               break;
-       case FPGA_LOAD:
-       case FPGA_LOADP:
-       case FPGA_LOADB:
-       case FPGA_LOADBP:
-       case FPGA_DUMP:
-               if (!fpga_data || !data_size)
-                       wrong_parms = 1;
-               break;
-#if defined(CONFIG_CMD_FPGA_LOADMK)
-       case FPGA_LOADMK:
-               if (!fpga_data)
-                       wrong_parms = 1;
-               break;
-#endif
-       }
-
-       if (wrong_parms) {
-               puts("Wrong parameters for FPGA request\n");
-               return CMD_RET_USAGE;
-       }
-
        switch (op) {
        case FPGA_INFO:
                rc = fpga_info(dev);