[U-Boot] [PATCH 3/9] drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning

Marek Vasut marek.vasut at gmail.com
Sun Dec 4 12:24:43 CET 2011


> 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 at denx.de>
> Cc: Heiko Schocher <hs at denx.de>
> Cc: Scott Wood <scottwood at 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 at gmail.com>


More information about the U-Boot mailing list