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 2d37197..7b140de 100644 (file)
--- a/common/cmd_setexpr.c
+++ b/common/cmd_setexpr.c
@@ -32,7 +32,7 @@ static ulong get_arg(char *s, int w)
 {
        ulong *p;
 
-        /*
+       /*
         * if the parameter starts with a '*' then assume
         * it is a pointer to the value we want
         */
@@ -50,17 +50,15 @@ static ulong get_arg(char *s, int w)
        }
 }
 
-int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong a, b;
        char buf[16];
        int w;
 
        /* Validate arguments */
-       if ((argc != 5) || (strlen(argv[3]) != 1)) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if ((argc != 5) || (strlen(argv[3]) != 1))
+               return CMD_RET_USAGE;
 
        w = cmd_get_data_size(argv[0], 4);