[PATCH v2 04/32] treewide: Tidy up semicolon after command macros
Ilias Apalodimas
ilias.apalodimas at linaro.org
Sat Nov 18 08:50:30 CET 2023
On Thu, 16 Nov 2023 at 06:11, Simon Glass <sjg at chromium.org> wrote:
>
> 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 at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
>
> (no changes since v1)
>
> board/freescale/common/vid.c | 2 +-
> board/xilinx/common/fru.c | 2 +-
> board/xilinx/versal/cmds.c | 2 +-
> board/xilinx/zynqmp/cmds.c | 2 +-
> cmd/btrfs.c | 2 +-
> cmd/eeprom.c | 2 +-
> cmd/ext2.c | 4 ++--
> cmd/fs.c | 8 ++++----
> cmd/pinmux.c | 2 +-
> cmd/qfw.c | 2 +-
> include/command.h | 2 +-
> 11 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
> index 5ec3f2a76b19..fc5d400cfe18 100644
> --- a/board/freescale/common/vid.c
> +++ b/board/freescale/common/vid.c
> @@ -793,4 +793,4 @@ U_BOOT_CMD(
> vdd_read, 1, 0, do_vdd_read,
> "read VDD",
> " - Read the voltage specified in mV"
> -)
> +);
> diff --git a/board/xilinx/common/fru.c b/board/xilinx/common/fru.c
> index c916c3d6b4c8..12b21317496a 100644
> --- a/board/xilinx/common/fru.c
> +++ b/board/xilinx/common/fru.c
> @@ -85,4 +85,4 @@ U_BOOT_CMD(
> fru, 8, 1, do_fru,
> "FRU table info",
> fru_help_text
> -)
> +);
> diff --git a/board/xilinx/versal/cmds.c b/board/xilinx/versal/cmds.c
> index 9cc2cdcebf1c..2a74e49aedec 100644
> --- a/board/xilinx/versal/cmds.c
> +++ b/board/xilinx/versal/cmds.c
> @@ -98,4 +98,4 @@ U_BOOT_LONGHELP(versal,
> U_BOOT_CMD(versal, 4, 1, do_versal,
> "versal sub-system",
> versal_help_text
> -)
> +);
> diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
> index f1f3eff501e1..9524688f27d9 100644
> --- a/board/xilinx/zynqmp/cmds.c
> +++ b/board/xilinx/zynqmp/cmds.c
> @@ -427,4 +427,4 @@ U_BOOT_CMD(
> zynqmp, 9, 1, do_zynqmp,
> "ZynqMP sub-system",
> zynqmp_help_text
> -)
> +);
> diff --git a/cmd/btrfs.c b/cmd/btrfs.c
> index 98daea99e9ed..2843835d08b8 100644
> --- a/cmd/btrfs.c
> +++ b/cmd/btrfs.c
> @@ -24,4 +24,4 @@ U_BOOT_CMD(btrsubvol, 3, 1, do_btrsubvol,
> "list subvolumes of a BTRFS filesystem",
> "<interface> <dev[:part]>\n"
> " - List subvolumes of a BTRFS filesystem."
> -)
> +);
> diff --git a/cmd/eeprom.c b/cmd/eeprom.c
> index 0b6ca8c505fb..322765ad02a0 100644
> --- a/cmd/eeprom.c
> +++ b/cmd/eeprom.c
> @@ -435,4 +435,4 @@ U_BOOT_CMD(
> "The values which can be provided with the -l option are:\n"
> CONFIG_EEPROM_LAYOUT_HELP_STRING"\n"
> #endif
> -)
> +);
> diff --git a/cmd/ext2.c b/cmd/ext2.c
> index 57a99516a6ac..a0ce0cf5796b 100644
> --- a/cmd/ext2.c
> +++ b/cmd/ext2.c
> @@ -42,7 +42,7 @@ U_BOOT_CMD(
> "list files in a directory (default /)",
> "<interface> <dev[:part]> [directory]\n"
> " - list files from 'dev' on 'interface' in a 'directory'"
> -)
> +);
>
> U_BOOT_CMD(
> ext2load, 6, 0, do_ext2load,
> @@ -50,4 +50,4 @@ U_BOOT_CMD(
> "<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"
> " - load binary file 'filename' from 'dev' on 'interface'\n"
> " to address 'addr' from ext2 filesystem."
> -)
> +);
> diff --git a/cmd/fs.c b/cmd/fs.c
> index 6044f73af5b4..46cb43dcdb5b 100644
> --- a/cmd/fs.c
> +++ b/cmd/fs.c
> @@ -39,7 +39,7 @@ U_BOOT_CMD(
> " 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"
> " 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,
> char *const argv[])
> @@ -56,7 +56,7 @@ U_BOOT_CMD(
> " 'bytes' gives the size to save in bytes and is mandatory.\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."
> -)
> +);
>
> static int do_ls_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
> char *const argv[])
> @@ -70,7 +70,7 @@ U_BOOT_CMD(
> "<interface> [<dev[:part]> [directory]]\n"
> " - List files in directory 'directory' of partition 'part' on\n"
> " device type 'interface' instance 'dev'."
> -)
> +);
>
> static int do_ln_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
> char *const argv[])
> @@ -84,7 +84,7 @@ U_BOOT_CMD(
> "<interface> <dev[:part]> target linkname\n"
> " - create a symbolic link to 'target' with the name 'linkname' on\n"
> " device type 'interface' instance 'dev'."
> -)
> +);
>
> static int do_fstype_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
> char *const argv[])
> diff --git a/cmd/pinmux.c b/cmd/pinmux.c
> index f17cf4110d9f..105f01eaafff 100644
> --- a/cmd/pinmux.c
> +++ b/cmd/pinmux.c
> @@ -178,4 +178,4 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,
> "list - list UCLASS_PINCTRL devices\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"
> -)
> +);
> diff --git a/cmd/qfw.c b/cmd/qfw.c
> index d6ecfa60d5a7..1b8c775ebf5a 100644
> --- a/cmd/qfw.c
> +++ b/cmd/qfw.c
> @@ -121,4 +121,4 @@ U_BOOT_CMD(
> " - list : print firmware(s) currently loaded\n"
> " - cpus : print online cpu number\n"
> " - load <kernel addr> <initrd addr> : load kernel and initrd (if any), and setup for zboot\n"
> -)
> +);
> diff --git a/include/command.h b/include/command.h
> index 6262365e128f..5bd3ecbe8f91 100644
> --- a/include/command.h
> +++ b/include/command.h
> @@ -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) \
> ll_entry_declare(struct cmd_tbl, _name, 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, \
> _help, _comp) \
> --
> 2.43.0.rc0.421.g78406f8d94-goog
>
More information about the U-Boot
mailing list