commands: return COMMAND_ERROR_USAGE

instead of calling u_boot_cmd_usage in each command to safe
space.

Signed-off-by: Sascha Hauer <sha@pengutronix.de>

33 files changed, 78 insertions, 156 deletions

diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c
index 446d830826..9ef5ac8e1f 100644
--- a/arch/arm/mach-imx/clko.c
+++ b/arch/arm/mach-imx/clko.c
@@ -21,10 +21,8 @@ static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (div == 0 && src == -2) {
-		u_boot_cmd_usage(cmdtp);
-		return 0;
-	}
+	if (div == 0 && src == -2)
+		return COMMAND_ERROR_USAGE;
 
 	if (src == -1) {
 		imx_clko_set_src(-1);
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index e65c2fa096..e2ad29c62a 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -134,8 +134,7 @@ int do_loadxc (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	return 0;
 
 failure:
-	printf ("Usage:\n%s\n", cmdtp->usage);
-	return 1;
+	return COMMAND_ERROR_USAGE;
 }
 
 void reset_cpu(ulong addr)
diff --git a/board/ipe337/cmd_alternate.c b/board/ipe337/cmd_alternate.c
index b007cf1f59..e563ab8d7a 100644
--- a/board/ipe337/cmd_alternate.c
+++ b/board/ipe337/cmd_alternate.c
@@ -12,10 +12,8 @@ static int do_alternate (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	size_t size;
 	ulong *ptr, val = 0, bitcount = 0;
 
-	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 0;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	buf = read_file(argv[1], &size);
 	if (!buf)
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 86b32332d3..209953331a 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -256,10 +256,8 @@ static int do_cpufreq(cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	unsigned long freq;
 
-	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	freq = simple_strtoul(argv[1], NULL, 0);
 
@@ -271,8 +269,7 @@ static int do_cpufreq(cmd_tbl_t *cmdtp, int argc, char *argv[])
 		writel(MPCTL_PARAM_532, IMX_CCM_BASE + CCM_MPCTL);
 		break;
 	default:
-		u_boot_cmd_usage(cmdtp);
-		return 1;
+		return COMMAND_ERROR_USAGE;
 	}
 
 	printf("Switched CPU frequency to %dMHz\n", freq);
diff --git a/commands/bootm.c b/commands/bootm.c
index d6d9609cd7..b9c58b1414 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -408,10 +408,8 @@ static int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (optind == argc)
+		return COMMAND_ERROR_USAGE;
 
 	os_handle = map_image(argv[optind], data.verify);
 	if (!os_handle)
diff --git a/commands/cp.c b/commands/cp.c
index 0a90c163b0..0fe3242e0c 100644
--- a/commands/cp.c
+++ b/commands/cp.c
@@ -44,10 +44,8 @@ static int do_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[])
 	int last_is_dir = 0;
 	int i;
 
-	if (argc < 3) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 3)
+		return COMMAND_ERROR_USAGE;
 
 	if (!stat(argv[argc - 1], &statbuf)) {
 		if (S_ISDIR(statbuf.st_mode))
diff --git a/commands/crc.c b/commands/crc.c
index 008cbb845f..7ac69c60f9 100644
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -53,10 +53,8 @@ static int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (!filegiven && optind == argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (!filegiven && optind == argc)
+		return COMMAND_ERROR_USAGE;
 
 	if (optind < argc) {
 		if (parse_area_spec(argv[optind], &start, &size)) {
diff --git a/commands/dfu.c b/commands/dfu.c
index 1f62cda9c5..d35b129651 100644
--- a/commands/dfu.c
+++ b/commands/dfu.c
@@ -124,10 +124,8 @@ static int do_dfu(cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (argc != optind + 1) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != optind + 1)
+		return COMMAND_ERROR_USAGE;
 
 	argstr = argv[optind];
 
diff --git a/commands/edit.c b/commands/edit.c
index 6fb4a61efd..66f90e918c 100644
--- a/commands/edit.c
+++ b/commands/edit.c
@@ -396,10 +396,8 @@ static int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[])
 	int linepos;
 	char c;
 
-	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	/* check if we are called as "sedit" insted of "edit" */
 	if (*argv[0] == 's')
diff --git a/commands/exec.c b/commands/exec.c
index b2b0fea238..4a232b6d05 100644
--- a/commands/exec.c
+++ b/commands/exec.c
@@ -34,10 +34,8 @@ static int do_exec(cmd_tbl_t * cmdtp, int argc, char *argv[])
 	int i;
 	char *script;
 
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	for (i=1; i<argc; ++i) {
 		script = read_file(argv[i]);
diff --git a/commands/export.c b/commands/export.c
index 9ab75e454c..55d61554a3 100644
--- a/commands/export.c
+++ b/commands/export.c
@@ -33,10 +33,8 @@ static int do_export ( cmd_tbl_t *cmdtp, int argc, char *argv[])
 	int i = 1;
 	char *ptr;
 
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	while (i < argc) {
 		if ((ptr = strchr(argv[i], '='))) {
diff --git a/commands/flash.c b/commands/flash.c
index c0c6e12ad1..35c34daa3c 100644
--- a/commands/flash.c
+++ b/commands/flash.c
@@ -45,10 +45,8 @@ static int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	unsigned long start = 0, size = ~0;
 	int ret = 0;
 
-	if (argc == 1) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc == 1)
+		return COMMAND_ERROR_USAGE;
 
 	filename = argv[1];
 
@@ -119,10 +117,8 @@ static int do_protect (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	unsigned long start = 0, size = ~0;
 	int ret = 0, err;
 
-	if (argc == 1) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc == 1)
+		return COMMAND_ERROR_USAGE;
 
 	filename = argv[1];
 
diff --git a/commands/go.c b/commands/go.c
index 627f21e938..82a20d7f71 100644
--- a/commands/go.c
+++ b/commands/go.c
@@ -36,10 +36,8 @@ static int do_go (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	int     rcode = 1;
 	int	fd = -1;
 
-	if (argc < 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	if (!isdigit(*argv[1])) {
 		fd = open(argv[1], O_RDONLY);
diff --git a/commands/insmod.c b/commands/insmod.c
index 28a59ead56..0b7c91ff00 100644
--- a/commands/insmod.c
+++ b/commands/insmod.c
@@ -11,10 +11,8 @@ static int do_insmod (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	void *buf;
 	int len;
 
-	if (argc < 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	buf = read_file(argv[1], &len);
 	if (!buf) {
diff --git a/commands/mem.c b/commands/mem.c
index 6b3165950f..b31a8f47d1 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -254,10 +254,8 @@ static int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[])
 	if (mem_parse_options(argc, argv, "bwld:", &mode, NULL, &filename) < 0)
 		return 1;
 
-	if (optind + 1 >= argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind + 1 >= argc)
+		return COMMAND_ERROR_USAGE;
 
 	adr = strtoul_suffix(argv[optind++], NULL, 0);
 
@@ -322,10 +320,8 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	if (mem_parse_options(argc, argv, "bwls:d:", &mode, &sourcefile, &destfile) < 0)
 		return 1;
 
-	if (optind + 2 > argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind + 2 > argc)
+		return COMMAND_ERROR_USAGE;
 
 	addr1 = strtoul_suffix(argv[optind], NULL, 0);
 	addr2 = strtoul_suffix(argv[optind + 1], NULL, 0);
@@ -433,10 +429,8 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	if (mem_parse_options(argc, argv, "bwls:d:", &mode, &sourcefile, &destfile) < 0)
 		return 1;
 
-	if (optind + 2 > argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind + 2 > argc)
+		return COMMAND_ERROR_USAGE;
 
 	src = strtoul_suffix(argv[optind], NULL, 0);
 	dest = strtoul_suffix(argv[optind + 1], NULL, 0);
@@ -530,10 +524,8 @@ static int do_memset(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	if (mem_parse_options(argc, argv, "bwld:", &mode, NULL, &file) < 0)
 		return 1;
 
-	if (optind + 3 > argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind + 3 > argc)
+		return COMMAND_ERROR_USAGE;
 
 	s = strtoul_suffix(argv[optind], NULL, 0);
 	c = strtoul_suffix(argv[optind + 1], NULL, 0);
diff --git a/commands/memtest.c b/commands/memtest.c
index f44459abc1..07b7b22d3b 100644
--- a/commands/memtest.c
+++ b/commands/memtest.c
@@ -326,10 +326,8 @@ static int do_mem_mtest (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	ulong start, end, pattern = 0;
 
-	if (argc < 3) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 3)
+		return COMMAND_ERROR_USAGE;
 
 	start = simple_strtoul(argv[1], NULL, 0);
 	end = simple_strtoul(argv[2], NULL, 0);
diff --git a/commands/mkdir.c b/commands/mkdir.c
index a2c298240a..4d9bcb602b 100644
--- a/commands/mkdir.c
+++ b/commands/mkdir.c
@@ -43,10 +43,8 @@ static int do_mkdir (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind == argc)
+		return COMMAND_ERROR_USAGE;
 
 	while (optind < argc) {
 		if (parent)
diff --git a/commands/mount.c b/commands/mount.c
index 54260e230f..530bd8ca1b 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -48,10 +48,8 @@ static int do_mount (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		return 0;
 	}
 
-	if (argc != 4) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != 4)
+		return COMMAND_ERROR_USAGE;
 
 	if ((ret = mount(argv[1], argv[2], argv[3]))) {
 		perror("mount");
diff --git a/commands/net.c b/commands/net.c
index f25a35d2f1..f059e7284b 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -171,10 +171,8 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 	char  *localfile;
 	char  *remotefile;
 
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	remotefile = argv[1];
 
@@ -275,10 +273,8 @@ static int do_ethact (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		return 0;
 	}
 
-	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	edev = eth_get_byname(argv[1]);
 	if (edev)
diff --git a/commands/partition.c b/commands/partition.c
index 30f7407175..877f82b4a6 100755
--- a/commands/partition.c
+++ b/commands/partition.c
@@ -107,10 +107,8 @@ static int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[])
 	off_t devsize;
 	struct stat s;
 
-	if (argc != 3) {
-		printf("Usage:\n  %s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc != 3)
+		return COMMAND_ERROR_USAGE;
 
 	if (stat(argv[1], &s)) {
 		perror("addpart");
diff --git a/commands/readline.c b/commands/readline.c
index cd24f3508a..f3fad4bb52 100644
--- a/commands/readline.c
+++ b/commands/readline.c
@@ -31,10 +31,8 @@ static int do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	char *buf = xzalloc(CONFIG_CBSIZE);
 
-	if (argc < 3) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 3)
+		return COMMAND_ERROR_USAGE;
 
 	if (readline(argv[1], buf, CONFIG_CBSIZE) < 0) {
 		free(buf);
diff --git a/commands/rm.c b/commands/rm.c
index f8a84f3eab..d211718f5f 100644
--- a/commands/rm.c
+++ b/commands/rm.c
@@ -28,10 +28,8 @@ static int do_rm (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	int i = 1;
 
-	if (argc < 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	while (i < argc) {
 		if (unlink(argv[i])) {
diff --git a/commands/rmdir.c b/commands/rmdir.c
index aaa7f80a72..2d8d5162b2 100644
--- a/commands/rmdir.c
+++ b/commands/rmdir.c
@@ -7,10 +7,8 @@ static int do_rmdir (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	int i = 1;
 
-	if (argc < 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	while (i < argc) {
 		if (rmdir(argv[i])) {
diff --git a/commands/setenv.c b/commands/setenv.c
index b6fd81ad4b..9fbacd74c5 100644
--- a/commands/setenv.c
+++ b/commands/setenv.c
@@ -30,10 +30,8 @@
 
 static int do_setenv ( cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	setenv(argv[1], argv[2]);
 
diff --git a/commands/sleep.c b/commands/sleep.c
index 955eb718d6..3c18a8694f 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -29,10 +29,8 @@ static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	uint64_t start;
 	ulong delay;
 
-	if (argc != 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	delay = simple_strtoul(argv[1], NULL, 10);
 
diff --git a/commands/splash.c b/commands/splash.c
index 9fd4ded8c5..f59978eafb 100644
--- a/commands/splash.c
+++ b/commands/splash.c
@@ -50,10 +50,8 @@ static int do_splash(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	char *src, *dst;
 	unsigned long *dstl, *srcl;
 
-	if (argc == 1) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc == 1)
+		return COMMAND_ERROR_USAGE;
 
 	if (!fbd) {
 		printf("No framebuffer found\n");
diff --git a/commands/timeout.c b/commands/timeout.c
index 3fa687c393..dbf17a7906 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -58,10 +58,8 @@ static int do_timeout(cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (optind == argc)
+		return COMMAND_ERROR_USAGE;
 
 	timeout = simple_strtoul(argv[optind], NULL, 0);
 
diff --git a/commands/umount.c b/commands/umount.c
index 1314473cdd..44b8407e16 100644
--- a/commands/umount.c
+++ b/commands/umount.c
@@ -28,10 +28,8 @@ static int do_umount (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
 	int ret = 0;
 
-	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc != 2)
+		return COMMAND_ERROR_USAGE;
 
 	if ((ret = umount(argv[1]))) {
 		perror("umount");
diff --git a/common/hush.c b/common/hush.c
index 5ff695beb7..70ccd047e3 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1582,10 +1582,8 @@ int run_shell(void)
 
 static int do_sh(cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	return execute_script(argv[1], argc - 1, argv + 1);
 }
@@ -1604,10 +1602,8 @@ U_BOOT_CMD_END
 
 static int do_source(cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
-	if (argc < 2) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
 
 	return source_script(argv[1], argc - 1, argv + 1);
 }
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index e2fb718c3c..b0106c2a13 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -1189,10 +1189,8 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	void *dest;
 	int size, pagesize, blocksize;
 
-	if (argc < 4) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 4)
+		return COMMAND_ERROR_USAGE;
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);
diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c
index 51d6120f6f..4119e2cab3 100644
--- a/drivers/nand/nand_imx_v2.c
+++ b/drivers/nand/nand_imx_v2.c
@@ -1107,10 +1107,8 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	void *dest;
 	int size, pagesize, blocksize;
 
-	if (argc < 4) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 4)
+		return COMMAND_ERROR_USAGE;
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);
diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c
index 699bb34b8c..e330a79433 100644
--- a/drivers/nand/nand_s3c2410.c
+++ b/drivers/nand/nand_s3c2410.c
@@ -489,10 +489,8 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	void *dest;
 	int size, pagesize;
 
-	if (argc < 3) {
-		u_boot_cmd_usage(cmdtp);
-		return 1;
-	}
+	if (argc < 3)
+		return COMMAND_ERROR_USAGE;
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);
diff --git a/net/ping.c b/net/ping.c
index 83a5819a46..3336292fc4 100644
--- a/net/ping.c
+++ b/net/ping.c
@@ -83,10 +83,8 @@ PingHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
 
 int do_ping (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
-	if (argc < 2 || string_to_ip(argv[1], &NetPingIP)) {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
+	if (argc < 2 || string_to_ip(argv[1], &NetPingIP))
+		return COMMAND_ERROR_USAGE;
 
 	if (NetLoopInit(PING) < 0)
 		return 1;