]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning
authorAnatolij Gustschin <agust@denx.de>
Sat, 3 Dec 2011 06:46:09 +0000 (06:46 +0000)
committerScott Wood <scottwood@freescale.com>
Wed, 7 Dec 2011 22:02:07 +0000 (16:02 -0600)
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>
Acked-by: Heiko Schocher <hs@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
drivers/mtd/nand/nand_spl_load.c

index ae8d5ac0e667c197a23b30985a242e745480cdc9..215459a83c6d63fa720ad67206f4d482dc14105e 100644 (file)
  */
 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