From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/9] drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning
Date: Sun, 4 Dec 2011 12:24:43 +0100 [thread overview]
Message-ID: <201112041224.43666.marek.vasut@gmail.com> (raw)
In-Reply-To: <1322930775-4767-3-git-send-email-agust@denx.de>
> Fix:
> nand_spl_load.c: In function 'nand_boot':
> nand_spl_load.c:31:6: warning: variable 'ret' set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
> drivers/mtd/nand/nand_spl_load.c | 13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_spl_load.c
> b/drivers/mtd/nand/nand_spl_load.c index ae8d5ac..215459a 100644
> --- a/drivers/mtd/nand/nand_spl_load.c
> +++ b/drivers/mtd/nand/nand_spl_load.c
> @@ -28,23 +28,22 @@
> */
> void nand_boot(void)
> {
> - int ret;
> __attribute__((noreturn)) void (*uboot)(void);
>
> /*
> * Load U-Boot image from NAND into RAM
> */
> - ret = nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
> + nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
> CONFIG_SYS_NAND_U_BOOT_SIZE,
> - (void *)CONFIG_SYS_NAND_U_BOOT_DST);
> + (void *)CONFIG_SYS_NAND_U_BOOT_DST);
>
> #ifdef CONFIG_NAND_ENV_DST
> - ret = nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
> - (void *)CONFIG_NAND_ENV_DST);
> + nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
> + (void *)CONFIG_NAND_ENV_DST);
>
> #ifdef CONFIG_ENV_OFFSET_REDUND
> - ret = nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE,
> - (void *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE);
> + nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE,
> + (void *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE);
> #endif
> #endif
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2011-12-04 11:24 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-03 16:46 [U-Boot] [PATCH 1/9] common/menu.c: Fix build warning Anatolij Gustschin
2011-12-03 16:46 ` [U-Boot] [PATCH 2/9] drivers/mtd/nand/nand_spl_simple.c: Fix GCC 4.6 warnings Anatolij Gustschin
2011-12-04 9:07 ` Heiko Schocher
2011-12-04 11:24 ` Marek Vasut
2011-12-07 22:10 ` Scott Wood
2011-12-03 16:46 ` [U-Boot] [PATCH 3/9] drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning Anatolij Gustschin
2011-12-04 9:15 ` Heiko Schocher
2011-12-04 11:24 ` Marek Vasut [this message]
2011-12-07 22:11 ` Scott Wood
2011-12-03 16:46 ` [U-Boot] [PATCH 4/9] drivers/usb/musb/musb_udc.c: " Anatolij Gustschin
2011-12-04 11:10 ` Remy Bohmer
2011-12-04 11:25 ` Marek Vasut
2011-12-09 9:36 ` Wolfgang Denk
2011-12-03 16:46 ` [U-Boot] [PATCH 5/9] drivers/usb/gadget/core.c: " Anatolij Gustschin
2011-12-04 11:06 ` Remy Bohmer
2011-12-04 11:27 ` Marek Vasut
2011-12-09 9:37 ` Wolfgang Denk
2011-12-03 16:46 ` [U-Boot] [PATCH 6/9] drivers/usb/gadget/ep0.c: " Anatolij Gustschin
2011-12-04 11:11 ` Remy Bohmer
2011-12-04 11:28 ` Marek Vasut
2011-12-09 9:37 ` Wolfgang Denk
2011-12-03 16:46 ` [U-Boot] [PATCH 7/9] arch/arm/cpu/armv7/omap-common/spl.c: Fix GCC 4.2 warnings Anatolij Gustschin
2011-12-04 11:28 ` Marek Vasut
2011-12-05 15:04 ` Tom Rini
2011-12-03 16:46 ` [U-Boot] [PATCH 8/9] arch/arm/cpu/armv7/omap-common/clocks-common.c: Fix GCC 4.6 warnings Anatolij Gustschin
2011-12-04 11:29 ` Marek Vasut
2011-12-05 15:02 ` Tom Rini
2011-12-05 16:32 ` Anatolij Gustschin
2011-12-05 17:11 ` Tom Rini
2011-12-03 16:46 ` [U-Boot] [PATCH 9/9] arch/arm/include/asm/arch-omap5/clocks.h: Fix GCC 4.2 warnings Anatolij Gustschin
2011-12-04 11:30 ` Marek Vasut
2011-12-04 13:59 ` Anatolij Gustschin
2011-12-05 15:08 ` Tom Rini
2011-12-06 5:52 ` R, Sricharan
2011-12-04 9:17 ` [U-Boot] [PATCH 1/9] common/menu.c: Fix build warning Heiko Schocher
2011-12-04 11:27 ` Marek Vasut
2011-12-04 11:49 ` Anatolij Gustschin
2011-12-05 22:26 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112041224.43666.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox