Requires a little reworking of the code flow with sub-functions, but not a big deal.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- common/cmd_sf.c | 59 +++++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 3abc4ff..11a491d 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -70,30 +70,30 @@ static int do_spi_flash_probe(int argc, char * const argv[]) struct spi_flash *new;
if (argc < 2) - goto usage; + return -1;
cs = simple_strtoul(argv[1], &endp, 0); if (*argv[1] == 0 || (*endp != 0 && *endp != ':')) - goto usage; + return -1; if (*endp == ':') { if (endp[1] == 0) - goto usage; + return -1;
bus = cs; cs = simple_strtoul(endp + 1, &endp, 0); if (*endp != 0) - goto usage; + return -1; }
if (argc >= 3) { speed = simple_strtoul(argv[2], &endp, 0); if (*argv[2] == 0 || *endp != 0) - goto usage; + return -1; } if (argc >= 4) { mode = simple_strtoul(argv[3], &endp, 16); if (*argv[3] == 0 || *endp != 0) - goto usage; + return -1; }
new = spi_flash_probe(bus, cs, speed, mode); @@ -107,10 +107,6 @@ static int do_spi_flash_probe(int argc, char * const argv[]) flash = new;
return 0; - -usage: - puts("Usage: sf probe [bus:]cs [hz] [mode]\n"); - return 1; }
static int do_spi_flash_read_write(int argc, char * const argv[]) @@ -123,17 +119,17 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) int ret;
if (argc < 4) - goto usage; + return -1;
addr = simple_strtoul(argv[1], &endp, 16); if (*argv[1] == 0 || *endp != 0) - goto usage; + return -1; offset = simple_strtoul(argv[2], &endp, 16); if (*argv[2] == 0 || *endp != 0) - goto usage; + return -1; len = simple_strtoul(argv[3], &endp, 16); if (*argv[3] == 0 || *endp != 0) - goto usage; + return -1;
buf = map_physmem(addr, len, MAP_WRBACK); if (!buf) { @@ -154,10 +150,6 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) }
return 0; - -usage: - printf("Usage: sf %s addr offset len\n", argv[0]); - return 1; }
static int do_spi_flash_erase(int argc, char * const argv[]) @@ -168,15 +160,15 @@ static int do_spi_flash_erase(int argc, char * const argv[]) int ret;
if (argc < 3) - goto usage; + return -1;
offset = simple_strtoul(argv[1], &endp, 16); if (*argv[1] == 0 || *endp != 0) - goto usage; + return -1;
ret = sf_parse_len_arg(argv[2], &len); if (ret != 1) - goto usage; + return -1;
ret = spi_flash_erase(flash, offset, len); if (ret) { @@ -185,24 +177,25 @@ static int do_spi_flash_erase(int argc, char * const argv[]) }
return 0; - -usage: - puts("Usage: sf erase offset [+]len\n"); - return 1; }
static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { const char *cmd; + int ret;
/* need at least two arguments */ if (argc < 2) goto usage;
cmd = argv[1]; + --argc; + ++argv;
- if (strcmp(cmd, "probe") == 0) - return do_spi_flash_probe(argc - 1, argv + 1); + if (strcmp(cmd, "probe") == 0) { + ret = do_spi_flash_probe(argc, argv); + goto done; + }
/* The remaining commands require a selected device */ if (!flash) { @@ -211,9 +204,15 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ }
if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0) - return do_spi_flash_read_write(argc - 1, argv + 1); - if (strcmp(cmd, "erase") == 0) - return do_spi_flash_erase(argc - 1, argv + 1); + ret = do_spi_flash_read_write(argc, argv); + else if (strcmp(cmd, "erase") == 0) + ret = do_spi_flash_erase(argc, argv); + else + ret = -1; + +done: + if (ret != -1) + return ret;
usage: return cmd_usage(cmdtp);