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>

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) {
+	if (div == 0 && src == -2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 0;
-	}
 
 	if (src == -1) {
 		imx_clko_set_src(-1);

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 COMMAND_ERROR_USAGE;
-	return 1;
 }
 
 void reset_cpu(ulong addr)

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) {
+	if (argc != 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 0;
-	}
 
 	buf = read_file(argv[1], &size);
 	if (!buf)

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) {
+	if (argc != 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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 COMMAND_ERROR_USAGE;
-		return 1;
 	}
 
 	printf("Switched CPU frequency to %dMHz\n", freq);

commands/bootm.c

@@ -408,10 +408,8 @@ static int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
+	if (optind == argc)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	os_handle = map_image(argv[optind], data.verify);
 	if (!os_handle)

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) {
+	if (argc < 3)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (!stat(argv[argc - 1], &statbuf)) {
 		if (S_ISDIR(statbuf.st_mode))

commands/crc.c

@@ -53,10 +53,8 @@ static int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (!filegiven && optind == argc) {
+	if (!filegiven && optind == argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (optind < argc) {
 		if (parse_area_spec(argv[optind], &start, &size)) {

commands/dfu.c

@@ -124,10 +124,8 @@ static int do_dfu(cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (argc != optind + 1) {
+	if (argc != optind + 1)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	argstr = argv[optind];
 

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) {
+	if (argc != 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	/* check if we are called as "sedit" insted of "edit" */
 	if (*argv[0] == 's')

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) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	for (i=1; i<argc; ++i) {
 		script = read_file(argv[i]);

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) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	while (i < argc) {
 		if ((ptr = strchr(argv[i], '='))) {

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) {
+	if (argc == 1)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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) {
+	if (argc == 1)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	filename = argv[1];
 

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) {
+	if (argc < 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (!isdigit(*argv[1])) {
 		fd = open(argv[1], O_RDONLY);

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) {
+	if (argc < 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	buf = read_file(argv[1], &len);
 	if (!buf) {

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) {
+	if (optind + 1 >= argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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) {
+	if (optind + 2 > argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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) {
+	if (optind + 2 > argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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) {
+	if (optind + 3 > argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	s = strtoul_suffix(argv[optind], NULL, 0);
 	c = strtoul_suffix(argv[optind + 1], NULL, 0);

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) {
+	if (argc < 3)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	start = simple_strtoul(argv[1], NULL, 0);
 	end = simple_strtoul(argv[2], NULL, 0);

commands/mkdir.c

@@ -43,10 +43,8 @@ static int do_mkdir (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
+	if (optind == argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	while (optind < argc) {
 		if (parent)

commands/mount.c

@@ -48,10 +48,8 @@ static int do_mount (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		return 0;
 	}
 
-	if (argc != 4) {
+	if (argc != 4)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if ((ret = mount(argv[1], argv[2], argv[3]))) {
 		perror("mount");

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) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	remotefile = argv[1];
 
@@ -275,10 +273,8 @@ static int do_ethact (cmd_tbl_t *cmdtp, int argc, char *argv[])
 		return 0;
 	}
 
-	if (argc != 2) {
+	if (argc != 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	edev = eth_get_byname(argv[1]);
 	if (edev)

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) {
+	if (argc != 3)
-		printf("Usage:\n  %s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (stat(argv[1], &s)) {
 		perror("addpart");

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) {
+	if (argc < 3)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (readline(argv[1], buf, CONFIG_CBSIZE) < 0) {
 		free(buf);

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) {
+	if (argc < 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	while (i < argc) {
 		if (unlink(argv[i])) {

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) {
+	if (argc < 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	while (i < argc) {
 		if (rmdir(argv[i])) {

commands/setenv.c

@@ -30,10 +30,8 @@
 
 static int do_setenv ( cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
-	if (argc < 2) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	setenv(argv[1], argv[2]);
 

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) {
+	if (argc != 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	delay = simple_strtoul(argv[1], NULL, 10);
 

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) {
+	if (argc == 1)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (!fbd) {
 		printf("No framebuffer found\n");

commands/timeout.c

@@ -58,10 +58,8 @@ static int do_timeout(cmd_tbl_t *cmdtp, int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc) {
+	if (optind == argc)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	timeout = simple_strtoul(argv[optind], NULL, 0);
 

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) {
+	if (argc != 2)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if ((ret = umount(argv[1]))) {
 		perror("umount");

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) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	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) {
+	if (argc < 2)
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	return source_script(argv[1], argc - 1, argv + 1);
 }

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) {
+	if (argc < 4)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);

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) {
+	if (argc < 4)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);

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) {
+	if (argc < 3)
-		u_boot_cmd_usage(cmdtp);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	dest = (void *)strtoul_suffix(argv[1], NULL, 0);
 	size = strtoul_suffix(argv[2], NULL, 0);

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)) {
+	if (argc < 2 || string_to_ip(argv[1], &NetPingIP))
-		printf ("Usage:\n%s\n", cmdtp->usage);
+		return COMMAND_ERROR_USAGE;
-		return 1;
-	}
 
 	if (NetLoopInit(PING) < 0)
 		return 1;