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>
This commit is contained in:
@@ -37,17 +37,14 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
||||
unsigned int num;
|
||||
unsigned int blocking;
|
||||
|
||||
if (argc < 2) {
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
}
|
||||
if (argc < 2)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
|
||||
blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16);
|
||||
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
|
||||
puts ("Bad number of FSL\n");
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
return cmd_usage(cmdtp);
|
||||
}
|
||||
|
||||
switch (fslnum) {
|
||||
@@ -195,18 +192,14 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
||||
unsigned int num;
|
||||
unsigned int blocking;
|
||||
|
||||
if (argc < 3) {
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
}
|
||||
if (argc < 3)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
|
||||
num = (unsigned int)simple_strtoul (argv[2], NULL, 16);
|
||||
blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16);
|
||||
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
}
|
||||
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
switch (fslnum) {
|
||||
#if (XILINX_FSL_NUMBER > 0)
|
||||
@@ -353,10 +346,9 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
||||
unsigned int reg = 0;
|
||||
unsigned int val = 0;
|
||||
|
||||
if (argc < 2) {
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
}
|
||||
if (argc < 2)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
|
||||
val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
|
||||
switch (reg) {
|
||||
|
||||
Reference in New Issue
Block a user