]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: simplify do_adc_single()
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Mon, 25 Apr 2022 20:26:45 +0000 (22:26 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 5 May 2022 19:06:02 +0000 (15:06 -0400)
If argc is not < 3, it must be >= 3.

If argc >= 3, argv[2] cannot be NULL.

Fixes: 9de612ae4ded ("cmd: adc: Add support for storing ADC result in env variable")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
cmd/adc.c

index 8de9121cad64a4ea0433ecfff7a482399e8c0e10..195efa8661c6772c4a93fa3932d8e66f6ee2480c 100644 (file)
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -71,7 +71,6 @@ static int do_adc_info(struct cmd_tbl *cmdtp, int flag, int argc,
 static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
                         char *const argv[])
 {
-       char *varname = NULL;
        struct udevice *dev;
        unsigned int data;
        int ret, uV, val;
@@ -79,9 +78,6 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
        if (argc < 3)
                return CMD_RET_USAGE;
 
-       if (argc >= 3)
-               varname = argv[2];
-
        ret = adc_channel_single_shot(argv[1], simple_strtol(argv[2], NULL, 0),
                                      &data);
        if (ret) {
@@ -99,8 +95,7 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("%u\n", data);
        }
 
-       if (varname)
-               env_set_ulong(varname, val);
+       env_set_ulong(argv[2], val);
 
        return CMD_RET_SUCCESS;
 }