From a645831ca0962532660e4db3155a8be85e5ca312 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 17 Jan 2019 10:18:47 +0100 Subject: [PATCH] cmd: mtd: fix compilation warning for help when SYS_LONGHELP=n MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit cmd/mtd.c:447:13: warning: ‘mtd_help_text’ defined but not used [-Wunused-variable] static char mtd_help_text[] = ^~~~~~~~~~~~~ When SYS_LONGHELP is not defined. After looking at how other commands work, we should surround the whole help text (even its declaration) with an #ifdef CONFIG_SYS_LONGHELP, since it's compiled out when calling _CMD_HELP[1] on the help text variable argument to U_BOOT_CMD. [1] https://elixir.bootlin.com/u-boot/latest/source/include/command.h#L181 Signed-off-by: Quentin Schulz Reviewed-by: Miquel Raynal --- cmd/mtd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/mtd.c b/cmd/mtd.c index cda702d18b..1b6b8dda2b 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -519,8 +519,8 @@ static int mtd_name_complete(int argc, char * const argv[], char last_char, } #endif /* CONFIG_AUTO_COMPLETE */ -static char mtd_help_text[] = #ifdef CONFIG_SYS_LONGHELP +static char mtd_help_text[] = "- generic operations on memory technology devices\n\n" "mtd list\n" "mtd read[.raw][.oob] [ []]\n" @@ -541,9 +541,8 @@ static char mtd_help_text[] = "\t\t* must be a multiple of a block for erase\n" "\t\t* must be a multiple of a page otherwise (special case: default is a page with dump)\n" "\n" - "The .dontskipff option forces writing empty pages, don't use it if unsure.\n" + "The .dontskipff option forces writing empty pages, don't use it if unsure.\n"; #endif - ""; U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils", mtd_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 1, do_mtd_list), -- 2.25.1