spl: nand: remove code duplication

Remove code duplication in spl_nand_load_image().

No functional changes.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
[trini: Add back cast to unsigned long of spl_image.load_addr]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index b8c369d984d05e856b725788b0a369e5e00fe5fd..302fe9c04f913de5e9bbd3a208e496bce27ced84 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -22,6 +22,19 @@ void spl_nand_load_image(void)
        nand_deselect();
 }
 #else
+static int spl_nand_load_element(int offset, struct image_header *header)
+{
+       int err;
+
+       err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
+       if (err)
+               return err;
+
+       spl_parse_image_header(header);
+       return nand_spl_load_image(offset, spl_image.size,
+                                  (void *)(unsigned long)spl_image.load_addr);
+}
+
 void spl_nand_load_image(void)
 {
        struct image_header *header;
@@ -73,25 +86,13 @@ void spl_nand_load_image(void)
        }
 #endif
 #ifdef CONFIG_NAND_ENV_DST
-       nand_spl_load_image(CONFIG_ENV_OFFSET,
-               sizeof(*header), (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
-               (void *)spl_image.load_addr);
+       spl_nand_load_element(CONFIG_ENV_OFFSET, header);
 #ifdef CONFIG_ENV_OFFSET_REDUND
-       nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
-               sizeof(*header), (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
-               (void *)spl_image.load_addr);
+       spl_nand_load_element(CONFIG_ENV_OFFSET_REDUND, header);
 #endif
 #endif
        /* Load u-boot */
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               sizeof(*header), (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               spl_image.size, (void *)(unsigned long)spl_image.load_addr);
+       spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS, header);
        nand_deselect();
 }
 #endif