spl: Remove NULL assignments in spl_load_info

Remove NULL assignments to fields in spl_load_info when .load doesn't
reference these fields. This can result in more efficient code. filename
must stay even if it is unused, since load_simple_fit uses it.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index c2410dd7bb161483b15f91eddd751bc3f11b7583..896aba69c3293641931e5995e02674cd1756562d 100644 (file)
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -354,8 +354,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                struct spl_load_info load;
 
                debug("Found FIT image\n");
-               load.dev = NULL;
-               load.priv = NULL;
                load.filename = NULL;
                load.bl_len = 1;
                load.read = spi_load_read;

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 014074f85be4e0dd0faf7731a44d898bfecd878c..6172e7bcd48f02e56d8d0f0ce23f49173e4bee1b 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -99,7 +99,6 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
                load.read = spl_fit_read;
                load.bl_len = 1;
                load.filename = (void *)filename;
-               load.priv = NULL;
 
                return spl_load_simple_fit(spl_image, &load, 0, header);
        } else {

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 82689da140140956f187b70592a9ffc6d208d801..6d9137c32e0ada617b8f48f1a1d50bd9a0217e36 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -106,7 +106,6 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
 
                debug("Found FIT\n");
                load.dev = mmc;
-               load.priv = NULL;
                load.filename = NULL;
                load.bl_len = mmc->read_bl_len;
                load.read = h_spl_load_read;
@@ -116,7 +115,6 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
                struct spl_load_info load;
 
                load.dev = mmc;
-               load.priv = NULL;
                load.filename = NULL;
                load.bl_len = mmc->read_bl_len;
                load.read = h_spl_load_read;

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index b8cd6403ba45f08425885f6ce296f214553eb1ee..9a5a5ffa04aaa790cd50041db3b167cf292fee03 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -91,7 +91,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
                struct spl_load_info load;
 
                debug("Found FIT\n");
-               load.dev = NULL;
                load.priv = &offset;
                load.filename = NULL;
                load.bl_len = bl_len;
@@ -101,7 +100,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
                   valid_container_hdr((void *)header)) {
                struct spl_load_info load;
 
-               load.dev = NULL;
                load.priv = &offset;
                load.filename = NULL;
                load.bl_len = bl_len;
@@ -112,8 +110,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
                struct spl_load_info load;
 
                debug("Found legacy image\n");
-               load.dev = NULL;
-               load.priv = NULL;
                load.filename = NULL;
                load.bl_len = IS_ENABLED(CONFIG_SPL_LZMA) ? bl_len : 1;
                load.read = spl_nand_legacy_read;

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 3ac4b1b5091c42d9e2b9b6563a3e67474f91522c..d83d70f2f3337e6e5a9af0760ea14a08bbe65c36 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -152,7 +152,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
 
                        debug("Found FIT\n");
                        load.dev = flash;
-                       load.priv = NULL;
                        load.filename = NULL;
                        load.bl_len = 1;
                        load.read = spl_spi_fit_read;
@@ -164,7 +163,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                        struct spl_load_info load;
 
                        load.dev = flash;
-                       load.priv = NULL;
                        load.filename = NULL;
                        load.bl_len = 1;
                        load.read = spl_spi_fit_read;

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 038b44384571261667f6ab34cd8c84d03af21189..8616cb3e915c96ac3e4702230d0dd09e0c462e78 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -134,7 +134,6 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image,
                struct ymodem_fit_info info;
 
                debug("Found FIT\n");
-               load.dev = NULL;
                load.priv = (void *)&info;
                load.filename = NULL;
                load.bl_len = 1;