From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miquel Raynal Date: Thu, 17 Jan 2019 10:22:30 +0100 Subject: [U-Boot] [PATCH] cmd: mtd: fix compilation warning for help when SYS_LONGHELP=n In-Reply-To: <20190117091847.27646-1-quentin.schulz@bootlin.com> References: <20190117091847.27646-1-quentin.schulz@bootlin.com> Message-ID: <20190117102230.0355e277@xps13> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de Hi Quentin, Quentin Schulz wrote on Thu, 17 Jan 2019 10:18:47 +0100: > 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 > --- > cmd/mtd.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/cmd/mtd.c b/cmd/mtd.c > index 6142223984..361813a4a1 100644 > --- a/cmd/mtd.c > +++ b/cmd/mtd.c > @@ -444,8 +444,8 @@ static int do_mtd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > return CMD_RET_SUCCESS; > } > > -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" > @@ -466,8 +466,7 @@ 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(mtd, 10, 1, do_mtd, "MTD utils", mtd_help_text); Reviewed-by: Miquel Raynal Thanks, Miquèl