env/ext4.c: remove CONFIG_CMD_SAVEENV ifdef
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Wed, 19 Feb 2020 09:47:42 +0000 (09:47 +0000)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2020 14:10:00 +0000 (10:10 -0400)
Removing this ifdef/endif pair yields a "defined but unused warning"
for CONFIG_CMD_SAVEENV=n, but that vanishes if we use the ENV_SAVE_PTR
macro instead. This gives slightly better compile testing, and
moreover, it's possible to have

  CONFIG_CMD_SAVEENV=n
  CONFIG_SPL_SAVEENV=y
  SPL_ENV_IS_IN_EXT4=y

in which case env_ext4_save would erroneously not be compiled in.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
env/ext4.c

index 1f6b1b5bd818ba674b8f828aa7c8af92e4b432c3..911e19c6d3d7e9f54fdbe3b634b2c6d4f4954769 100644 (file)
@@ -41,7 +41,6 @@ __weak const char *env_ext4_get_dev_part(void)
        return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
 }
 
-#ifdef CONFIG_CMD_SAVEENV
 static int env_ext4_save(void)
 {
        env_t   env_new;
@@ -83,7 +82,6 @@ static int env_ext4_save(void)
        puts("done\n");
        return 0;
 }
-#endif /* CONFIG_CMD_SAVEENV */
 
 static int env_ext4_load(void)
 {
@@ -137,5 +135,5 @@ U_BOOT_ENV_LOCATION(ext4) = {
        .location       = ENVL_EXT4,
        ENV_NAME("EXT4")
        .load           = env_ext4_load,
-       .save           = env_save_ptr(env_ext4_save),
+       .save           = ENV_SAVE_PTR(env_ext4_save),
 };