[PATCH v2 1/2] env: Make more use of the ENV_SAVE_PTR macro

[Tom Rini]

With commit 82b2f4135719 ("env_internal.h: add alternative ENV_SAVE_PTR
macro") we introduced the ENV_SAVE_PTR macro but as explained in the
commit message, left full conversion for a later time. This commit
makes more progress on that front by doing the remaining easy
conversions to the new macro.

Signed-off-by: Tom Rini <trini at konsulko.com>

Changes in v2:
- Reduce the number of conversions, some didn't work as expected once
  CMD_SAVEENV was actually disabled.
- Finish converting UBI

Cc Rasmus Villemoes <rasmus.villemoes at prevas.dk>
---
 env/eeprom.c  | 2 +-
 env/nvram.c   | 2 +-
 env/onenand.c | 2 +-
 env/scsi.c    | 4 +---
 env/ubi.c     | 4 +---
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/env/eeprom.c b/env/eeprom.c
index b290b1013e1c..f4cc29093768 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -175,5 +175,5 @@ U_BOOT_ENV_LOCATION(eeprom) = {
 	.location	= ENVL_EEPROM,
 	ENV_NAME("EEPROM")
 	.load		= env_eeprom_load,
-	.save		= env_save_ptr(env_eeprom_save),
+	.save		= ENV_SAVE_PTR(env_eeprom_save),
 };
diff --git a/env/nvram.c b/env/nvram.c
index d49cd0f337a0..18f0a0aa1fbf 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -65,6 +65,6 @@ U_BOOT_ENV_LOCATION(nvram) = {
 	.location	= ENVL_NVRAM,
 	ENV_NAME("NVRAM")
 	.load		= env_nvram_load,
-	.save		= env_save_ptr(env_nvram_save),
+	.save		= ENV_SAVE_PTR(env_nvram_save),
 	.init		= env_nvram_init,
 };
diff --git a/env/onenand.c b/env/onenand.c
index 8c349ef5ce6c..59b523e06c63 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -107,5 +107,5 @@ U_BOOT_ENV_LOCATION(onenand) = {
 	.location	= ENVL_ONENAND,
 	ENV_NAME("OneNAND")
 	.load		= env_onenand_load,
-	.save		= env_save_ptr(env_onenand_save),
+	.save		= ENV_SAVE_PTR(env_onenand_save),
 };
diff --git a/env/scsi.c b/env/scsi.c
index 207717e17b16..e56891a98993 100644
--- a/env/scsi.c
+++ b/env/scsi.c
@@ -108,8 +108,6 @@ U_BOOT_ENV_LOCATION(scsi) = {
 	.location	= ENVL_SCSI,
 	ENV_NAME("SCSI")
 	.load		= env_scsi_load,
-#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_XPL_BUILD)
-	.save		= env_save_ptr(env_scsi_save),
+	.save		= ENV_SAVE_PTR(env_scsi_save),
 	.erase		= ENV_ERASE_PTR(env_scsi_erase),
-#endif
 };
diff --git a/env/ubi.c b/env/ubi.c
index 59bd96feb488..e9865b45ebc6 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define ENV_UBI_VOLUME_REDUND "invalid"
 #endif
 
-#ifdef CONFIG_CMD_SAVEENV
 #ifdef CONFIG_ENV_REDUNDANT
 static int env_ubi_save(void)
 {
@@ -103,7 +102,6 @@ static int env_ubi_save(void)
 	return 0;
 }
 #endif /* CONFIG_ENV_REDUNDANT */
-#endif /* CONFIG_CMD_SAVEENV */
 
 #ifdef CONFIG_ENV_REDUNDANT
 static int env_ubi_load(void)
@@ -219,6 +217,6 @@ U_BOOT_ENV_LOCATION(ubi) = {
 	.location	= ENVL_UBI,
 	ENV_NAME("UBI")
 	.load		= env_ubi_load,
-	.save		= env_save_ptr(env_ubi_save),
+	.save		= ENV_SAVE_PTR(env_ubi_save),
 	.erase		= ENV_ERASE_PTR(env_ubi_erase),
 };
-- 
2.43.0