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 c2410dd..896aba6 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -354,8 +354,6 @@
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 014074f..6172e7b 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -99,7 +99,6 @@
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 82689da..6d9137c 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -106,7 +106,6 @@
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 @@
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 b8cd640..9a5a5ff 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -91,7 +91,6 @@
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 @@
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 @@
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 3ac4b1b..d83d70f 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -152,7 +152,6 @@
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 @@
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 038b443..8616cb3 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -134,7 +134,6 @@
struct ymodem_fit_info info;
debug("Found FIT\n");
- load.dev = NULL;
load.priv = (void *)&info;
load.filename = NULL;
load.bl_len = 1;