Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / drivers / mtd / nand / nand_spl_load.c

diff --git a/drivers/mtd/nand/nand_spl_load.c b/drivers/mtd/nand/nand_spl_load.c
index ae8d5ac0e667c197a23b30985a242e745480cdc9..215459a83c6d63fa720ad67206f4d482dc14105e 100644 (file)
--- 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