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:
Wolfgang Denk
2010-07-17 01:06:04 +02:00
parent debb6299ac
commit 47e26b1bf9
89 changed files with 454 additions and 833 deletions

View File

@@ -28,10 +28,8 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
unsigned long cpuid;
if (argc < 3) {
cmd_usage(cmdtp);
return 1;
}
if (argc < 3)
return cmd_usage(cmdtp);
cpuid = simple_strtoul(argv[1], NULL, 10);
if (cpuid >= cpu_numcores()) {
@@ -42,29 +40,24 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc == 3) {
if (strncmp(argv[2], "reset", 5) == 0) {
if (strncmp(argv[2], "reset", 5) == 0)
cpu_reset(cpuid);
} else if (strncmp(argv[2], "status", 6) == 0) {
else if (strncmp(argv[2], "status", 6) == 0)
cpu_status(cpuid);
} else if (strncmp(argv[2], "disable", 7) == 0) {
else if (strncmp(argv[2], "disable", 7) == 0)
return cpu_disable(cpuid);
} else {
cmd_usage(cmdtp);
return 1;
}
else
return cmd_usage(cmdtp);
return 0;
}
/* 4 or greater, make sure its release */
if (strncmp(argv[2], "release", 7) != 0) {
cmd_usage(cmdtp);
return 1;
}
if (strncmp(argv[2], "release", 7) != 0)
return cmd_usage(cmdtp);
if (cpu_release(cpuid, argc - 3, argv + 3)) {
cmd_usage(cmdtp);
return 1;
}
if (cpu_release(cpuid, argc - 3, argv + 3))
return cmd_usage(cmdtp);
return 0;
}