From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 30 May 2018 08:04:34 +0000 (+0200)
Subject: cmd: fpga: Cleanup error handling in connection to FPGA_NONE
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ccd65203275f74b5bb6fa8c7920627493c28e65f;p=u-boot.git

cmd: fpga: Cleanup error handling in connection to FPGA_NONE

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>
---

diff --git a/cmd/fpga.c b/cmd/fpga.c
index de8505e9d4..af2f514dca 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -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;