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 /common/cmd_mmc.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 'common/cmd_mmc.c')
| -rw-r--r-- | common/cmd_mmc.c | 15 | 
1 files changed, 5 insertions, 10 deletions
| diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 698157f6b..e5f5e944d 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -32,10 +32,8 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  {  	int dev; -	if (argc < 2) { -		cmd_usage(cmdtp); -		return 1; -	} +	if (argc < 2) +		return cmd_usage(cmdtp);  	if (strcmp(argv[1], "init") == 0) {  		if (argc == 2) { @@ -46,8 +44,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		} else if (argc == 3) {  			dev = (int)simple_strtoul(argv[2], NULL, 10);  		} else { -			cmd_usage(cmdtp); -			return 1; +			return cmd_usage(cmdtp);  		}  		if (mmc_legacy_init(dev) != 0) { @@ -72,14 +69,12 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  #endif  			curr_device = dev;  		} else { -			cmd_usage(cmdtp); -			return 1; +			return cmd_usage(cmdtp);  		}  		printf("mmc%d is current device\n", curr_device);  	} else { -		cmd_usage(cmdtp); -		return 1; +		return cmd_usage(cmdtp);  	}  	return 0; |