From e4269636bec4e64dc363e237c2d1efa0e8645310 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 25 Apr 2022 18:35:05 +0200 Subject: cmd: fix long text for fdt command We don't have an option -cq but two distinct options -c and -q. Fixes: e9496ec37440 ("fdt: Add -q option to fdt addr for distro_bootcmd") Signed-off-by: Heinrich Schuchardt --- cmd/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/fdt.c b/cmd/fdt.c index c07342cf25f..842e6cb634b 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -1071,7 +1071,7 @@ static int fdt_print(const char *pathp, char *prop, int depth) /********************************************************************/ #ifdef CONFIG_SYS_LONGHELP static char fdt_help_text[] = - "addr [-cq] [] - Set the [control] fdt location to \n" + "addr [-c] [-q] [] - Set the [control] fdt location to \n" #ifdef CONFIG_OF_LIBFDT_OVERLAY "fdt apply - Apply overlay to the DT\n" #endif -- cgit v1.2.3 From 54d24d72601321f4470c4edf31c6b29adae424a7 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 25 Apr 2022 22:26:45 +0200 Subject: cmd: simplify do_adc_single() 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 --- cmd/adc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'cmd') diff --git a/cmd/adc.c b/cmd/adc.c index 8de9121cad6..195efa8661c 100644 --- 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; } -- cgit v1.2.3 From 6d81319728c6a20b3e6d3dc828cb351fb5dcb1c6 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 25 Apr 2022 23:01:44 +0200 Subject: cmd: onenand: fix printf codes For printing size_t use %zu or %zx. Signed-off-by: Heinrich Schuchardt --- cmd/onenand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/onenand.c b/cmd/onenand.c index 592985a7ee3..d633f19d3bb 100644 --- a/cmd/onenand.c +++ b/cmd/onenand.c @@ -53,7 +53,7 @@ static int arg_off_size_onenand(int argc, char *const argv[], ulong *off, if (*size == mtd->size) puts("whole chip\n"); else - printf("offset 0x%lx, size 0x%x\n", *off, *size); + printf("offset 0x%lx, size 0x%zx\n", *off, *size); return 0; } @@ -401,7 +401,7 @@ static int do_onenand_read(struct cmd_tbl *cmdtp, int flag, int argc, ret = onenand_block_read(ofs, len, &retlen, (u8 *)addr, oob); - printf(" %d bytes read: %s\n", retlen, ret ? "ERROR" : "OK"); + printf(" %zu bytes read: %s\n", retlen, ret ? "ERROR" : "OK"); return ret == 0 ? 0 : 1; } @@ -428,7 +428,7 @@ static int do_onenand_write(struct cmd_tbl *cmdtp, int flag, int argc, ret = onenand_block_write(ofs, len, &retlen, (u8 *)addr, withoob); - printf(" %d bytes written: %s\n", retlen, ret ? "ERROR" : "OK"); + printf(" %zu bytes written: %s\n", retlen, ret ? "ERROR" : "OK"); return ret == 0 ? 0 : 1; } -- cgit v1.2.3 From 274347030631141f3e6259b2ec4fcd11365dd9a3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 25 Apr 2022 23:11:06 +0200 Subject: cmd: mmc: don't assign unused values Don't assign a value to variable speedmode which is never used. Signed-off-by: Heinrich Schuchardt --- cmd/mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/mmc.c b/cmd/mmc.c index 7464f8d00cd..63bf69b0bd0 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -501,11 +501,12 @@ static int do_mmc_rescan(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct mmc *mmc; - enum bus_mode speed_mode = MMC_MODES_END; if (argc == 1) { mmc = init_mmc_device(curr_device, true); } else if (argc == 2) { + enum bus_mode speed_mode; + speed_mode = (int)dectoul(argv[1], NULL); mmc = __init_mmc_device(curr_device, true, speed_mode); } else { @@ -543,7 +544,6 @@ static int do_mmc_dev(struct cmd_tbl *cmdtp, int flag, { int dev, part = 0, ret; struct mmc *mmc; - enum bus_mode speed_mode = MMC_MODES_END; if (argc == 1) { dev = curr_device; @@ -561,6 +561,8 @@ static int do_mmc_dev(struct cmd_tbl *cmdtp, int flag, } mmc = init_mmc_device(dev, true); } else if (argc == 4) { + enum bus_mode speed_mode; + dev = (int)dectoul(argv[1], NULL); part = (int)dectoul(argv[2], NULL); if (part > PART_ACCESS_MASK) { -- cgit v1.2.3