treewide: Tidy up semicolon after command macros

The U_BOOT_CMD_COMPLETE() macro has a semicolon at the end, perhaps
inadvertently. Some code has taken advantage of this.

Tidy this up by dropping the semicolon from the macro and adding it to
macro invocations as required.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Simon Glass 2023-11-18 14:04:52 -07:00 committed by Tom Rini
parent f7fac5e7f5
commit 10c398d6e4
11 changed files with 15 additions and 15 deletions

View file

@ -793,4 +793,4 @@ U_BOOT_CMD(
vdd_read, 1, 0, do_vdd_read, vdd_read, 1, 0, do_vdd_read,
"read VDD", "read VDD",
" - Read the voltage specified in mV" " - Read the voltage specified in mV"
) );

View file

@ -85,4 +85,4 @@ U_BOOT_CMD(
fru, 8, 1, do_fru, fru, 8, 1, do_fru,
"FRU table info", "FRU table info",
fru_help_text fru_help_text
) );

View file

@ -98,4 +98,4 @@ U_BOOT_LONGHELP(versal,
U_BOOT_CMD(versal, 4, 1, do_versal, U_BOOT_CMD(versal, 4, 1, do_versal,
"versal sub-system", "versal sub-system",
versal_help_text versal_help_text
) );

View file

@ -427,4 +427,4 @@ U_BOOT_CMD(
zynqmp, 9, 1, do_zynqmp, zynqmp, 9, 1, do_zynqmp,
"ZynqMP sub-system", "ZynqMP sub-system",
zynqmp_help_text zynqmp_help_text
) );

View file

@ -24,4 +24,4 @@ U_BOOT_CMD(btrsubvol, 3, 1, do_btrsubvol,
"list subvolumes of a BTRFS filesystem", "list subvolumes of a BTRFS filesystem",
"<interface> <dev[:part]>\n" "<interface> <dev[:part]>\n"
" - List subvolumes of a BTRFS filesystem." " - List subvolumes of a BTRFS filesystem."
) );

View file

@ -435,4 +435,4 @@ U_BOOT_CMD(
"The values which can be provided with the -l option are:\n" "The values which can be provided with the -l option are:\n"
CONFIG_EEPROM_LAYOUT_HELP_STRING"\n" CONFIG_EEPROM_LAYOUT_HELP_STRING"\n"
#endif #endif
) );

View file

@ -42,7 +42,7 @@ U_BOOT_CMD(
"list files in a directory (default /)", "list files in a directory (default /)",
"<interface> <dev[:part]> [directory]\n" "<interface> <dev[:part]> [directory]\n"
" - list files from 'dev' on 'interface' in a 'directory'" " - list files from 'dev' on 'interface' in a 'directory'"
) );
U_BOOT_CMD( U_BOOT_CMD(
ext2load, 6, 0, do_ext2load, ext2load, 6, 0, do_ext2load,
@ -50,4 +50,4 @@ U_BOOT_CMD(
"<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n" "<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n" " - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from ext2 filesystem." " to address 'addr' from ext2 filesystem."
) );

View file

@ -39,7 +39,7 @@ U_BOOT_CMD(
" If 'bytes' is 0 or omitted, the file is read until the end.\n" " If 'bytes' is 0 or omitted, the file is read until the end.\n"
" 'pos' gives the file byte position to start reading from.\n" " 'pos' gives the file byte position to start reading from.\n"
" If 'pos' is 0 or omitted, the file is read from the start." " If 'pos' is 0 or omitted, the file is read from the start."
) );
static int do_save_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, static int do_save_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
@ -56,7 +56,7 @@ U_BOOT_CMD(
" 'bytes' gives the size to save in bytes and is mandatory.\n" " 'bytes' gives the size to save in bytes and is mandatory.\n"
" 'pos' gives the file byte position to start writing to.\n" " 'pos' gives the file byte position to start writing to.\n"
" If 'pos' is 0 or omitted, the file is written from the start." " If 'pos' is 0 or omitted, the file is written from the start."
) );
static int do_ls_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, static int do_ls_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
@ -70,7 +70,7 @@ U_BOOT_CMD(
"<interface> [<dev[:part]> [directory]]\n" "<interface> [<dev[:part]> [directory]]\n"
" - List files in directory 'directory' of partition 'part' on\n" " - List files in directory 'directory' of partition 'part' on\n"
" device type 'interface' instance 'dev'." " device type 'interface' instance 'dev'."
) );
static int do_ln_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, static int do_ln_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
@ -84,7 +84,7 @@ U_BOOT_CMD(
"<interface> <dev[:part]> target linkname\n" "<interface> <dev[:part]> target linkname\n"
" - create a symbolic link to 'target' with the name 'linkname' on\n" " - create a symbolic link to 'target' with the name 'linkname' on\n"
" device type 'interface' instance 'dev'." " device type 'interface' instance 'dev'."
) );
static int do_fstype_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, static int do_fstype_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])

View file

@ -178,4 +178,4 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,
"list - list UCLASS_PINCTRL devices\n" "list - list UCLASS_PINCTRL devices\n"
"pinmux dev [pincontroller-name] - select pin-controller device\n" "pinmux dev [pincontroller-name] - select pin-controller device\n"
"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" "pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n"
) );

View file

@ -121,4 +121,4 @@ U_BOOT_CMD(
" - list : print firmware(s) currently loaded\n" " - list : print firmware(s) currently loaded\n"
" - cpus : print online cpu number\n" " - cpus : print online cpu number\n"
" - load <kernel addr> <initrd addr> : load kernel and initrd (if any), and setup for zboot\n" " - load <kernel addr> <initrd addr> : load kernel and initrd (if any), and setup for zboot\n"
) );

View file

@ -390,7 +390,7 @@ int cmd_source_script(ulong addr, const char *fit_uname, const char *confname);
#define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, _comp) \ #define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, _comp) \
ll_entry_declare(struct cmd_tbl, _name, cmd) = \ ll_entry_declare(struct cmd_tbl, _name, cmd) = \
U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \ U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \
_usage, _help, _comp); _usage, _help, _comp)
#define U_BOOT_CMDREP_COMPLETE(_name, _maxargs, _cmd_rep, _usage, \ #define U_BOOT_CMDREP_COMPLETE(_name, _maxargs, _cmd_rep, _usage, \
_help, _comp) \ _help, _comp) \