diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-17 01:06:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:43:57 +0200 |
| commit | 47e26b1bf91ddef69f4a3892815c857db094cef9 (patch) | |
| tree | 7d688085d23779707c637703273f79bd3cca83e0 /drivers/misc/ds4510.c | |
| parent | debb6299ac1180a08f29f88c6d782b21a9c98707 (diff) | |
| download | olio-uboot-2014.01-47e26b1bf91ddef69f4a3892815c857db094cef9.tar.xz olio-uboot-2014.01-47e26b1bf91ddef69f4a3892815c857db094cef9.zip | |
cmd_usage(): simplify return code handling
Lots of code use this construct:
cmd_usage(cmdtp);
return 1;
Change cmd_usage() let it return 1 - then we can replace all these
ocurrances by
return cmd_usage(cmdtp);
This fixes a few places with incorrect return code handling, too.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/misc/ds4510.c')
| -rw-r--r-- | drivers/misc/ds4510.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 5b33c1ffc..aa893c35f 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -294,8 +294,7 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (!c || !((argc == (c->maxargs)) || (((int)c->cmd == DS4510_CMD_DEVICE) && (argc == (c->maxargs - 1))))) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } /* arg2 used as chip addr and pin number */ @@ -366,14 +365,12 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_CMD_DS4510_MEM /* Only eeprom, seeprom, and sram commands should make it here */ - if (strcmp(argv[2], "read") == 0) { + if (strcmp(argv[2], "read") == 0) rw_func = ds4510_mem_read; - } else if (strcmp(argv[2], "write") == 0) { + else if (strcmp(argv[2], "write") == 0) rw_func = ds4510_mem_write; - } else { - cmd_usage(cmdtp); - return 1; - } + else + return cmd_usage(cmdtp); addr = simple_strtoul(argv[3], NULL, 16); off += simple_strtoul(argv[4], NULL, 16); |