diff options
| author | Simon Glass <sjg@chromium.org> | 2011-12-10 08:44:01 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-06 21:09:46 +0100 |
| commit | 4c12eeb8b55483e48ef98b8a480e2bbacc9f210d (patch) | |
| tree | 7624947e7cd097d48ea3a2e1a3ccfa82ee766fc4 /common/cmd_flash.c | |
| parent | 9d12d5d41d5653ba2f943886f45b8c2eb0f63450 (diff) | |
| download | talos-obmc-uboot-4c12eeb8b55483e48ef98b8a480e2bbacc9f210d.tar.gz talos-obmc-uboot-4c12eeb8b55483e48ef98b8a480e2bbacc9f210d.zip | |
Convert cmd_usage() calls in common to use a return value
Change all files in common/ to use CMD_RET_USAGE instead of calling
cmd_usage() directly. I'm not completely sure about this patch since
the code since impact is small (100 byte or so on ARM) and it might
need splitting into smaller patches. But for now here it is.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_flash.c')
| -rw-r--r-- | common/cmd_flash.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index c6ea25ac5b..0e9b2e3c74 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -335,7 +335,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int rcode = 0; if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; if (strcmp(argv[1], "all") == 0) { for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { @@ -384,7 +384,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif if (argc != 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; if (strcmp(argv[1], "bank") == 0) { bank = simple_strtoul(argv[2], NULL, 16); @@ -405,7 +405,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } if (addr_first >= addr_last) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; rcode = flash_sect_erase(addr_first, addr_last); return rcode; @@ -475,7 +475,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; #if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) if (strcmp(argv[1], "off") == 0) @@ -483,7 +483,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else if (strcmp(argv[1], "on") == 0) p = 1; else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; #endif #ifdef CONFIG_HAS_DATAFLASH @@ -583,7 +583,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif if (argc != 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; if (strcmp(argv[2], "bank") == 0) { bank = simple_strtoul(argv[3], NULL, 16); @@ -623,7 +623,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } if (addr_first >= addr_last) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; rcode = flash_sect_protect (p, addr_first, addr_last); #endif /* CONFIG_SYS_NO_FLASH */ |
