Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[pandora-u-boot.git] / common / cmd_setexpr.c

diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c
index 1ff1232..7b140de 100644 (file)
--- a/common/cmd_setexpr.c
+++ b/common/cmd_setexpr.c
@@ -50,7 +50,7 @@ static ulong get_arg(char *s, int w)
        }
 }
 
-int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong a, b;
        char buf[16];
@@ -58,7 +58,7 @@ int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        /* Validate arguments */
        if ((argc != 5) || (strlen(argv[3]) != 1))
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        w = cmd_get_data_size(argv[0], 4);