Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmd: simplify do_adc_single()

Browse source 
If argc is not < 3, it must be >= 3.

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

Fixes: 9de612ae4d ("cmd: adc: Add support for storing ADC result in env variable")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-04-25 22:26:45 +02:00 committed by Tom Rini
parent e4269636be
commit 54d24d7260
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/adc.c
View file

@ -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, static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
{ {
char *varname = NULL;
struct udevice *dev; struct udevice *dev;
unsigned int data; unsigned int data;
int ret, uV, val; int ret, uV, val;
@ -79,9 +78,6 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
if (argc < 3) if (argc < 3)
return CMD_RET_USAGE; return CMD_RET_USAGE;
if (argc >= 3)
varname = argv[2];
ret = adc_channel_single_shot(argv[1], simple_strtol(argv[2], NULL, 0), ret = adc_channel_single_shot(argv[1], simple_strtol(argv[2], NULL, 0),
&data); &data);
if (ret) { if (ret) {
@ -99,8 +95,7 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
printf("%u\n", data); printf("%u\n", data);
} }
if (varname) env_set_ulong(argv[2], val);
env_set_ulong(varname, val);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }