env: Drop unused env_ptr variables

This variable is declared as a global in most environment location
drivers. But it is not used outside the drivers and most of the
declarations are unnecessary.

Also some drivers call free() on env_ptr which seems wrong since it is
not in the heap.

Drop the variable where possible, and all calls to free().

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/env/dataflash.c b/env/dataflash.c
index 9421a6a5b236c598e900cfb66a542e11bf988a88..28dcf6fa1cda7aaee4284d7598bced32dccd7475 100644 (file)
--- a/env/dataflash.c
+++ b/env/dataflash.c
@@ -14,8 +14,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 static unsigned char env_dataflash_get_char(int index)
 {
        uchar c;

diff --git a/env/eeprom.c b/env/eeprom.c
index 2c795b9236dc322eb7e364892563f321e5aa440a..39adccabbee106e4eeb5ba30c2e169bd3f4063e2 100644 (file)
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -21,8 +21,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
                           uchar *buffer, unsigned cnt)
 {
@@ -196,8 +194,6 @@ static int env_eeprom_save(void)
        char flag_obsolete      = OBSOLETE_FLAG;
 #endif
 
-       BUG_ON(env_ptr != NULL);
-
        rc = env_export(&env_new);
        if (rc)
                return rc;

diff --git a/env/ext4.c b/env/ext4.c
index 5acdf0eda0dbb6d368622565237a87721ef0fc37..ee073a8b7ccd99c72c65e9b3f072e493da2a055b 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -31,8 +31,6 @@
 #include <ext4fs.h>
 #include <mmc.h>
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_CMD_SAVEENV

diff --git a/env/fat.c b/env/fat.c
index eda18dbf3d4723ddb59ce5e488447ef0636f7833..a5a156c88b5b78c17f133e40397634784d0e93c3 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -31,8 +31,6 @@
 # endif
 #endif
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CMD_SAVEENV

diff --git a/env/mmc.c b/env/mmc.c
index 18da6dc58c88e90695f685e9ccd280f4218bb626..88ffc91f0b58838106e560e7648e47fbc5f5880c 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -23,12 +23,6 @@
 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
 #endif
 
-#ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
-#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr;
-#endif /* ENV_IS_EMBEDDED */
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CONFIG_ENV_OFFSET)

diff --git a/env/nowhere.c b/env/nowhere.c
index 1a17d6978b90026525445fe9dbd6f55aaca47dd9..d60de494e6c40eadaca899ec44f8cc4b2314e2ec 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -15,8 +15,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
        ENV_NAME("nowhere")

diff --git a/env/nvram.c b/env/nvram.c
index 0f4b491fd3b688868d21fcae80a918565fcbda37..ac389ace622d701cd8f7e73a71ac67d684d81676 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -36,7 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
-env_t *env_ptr;
 #else
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif

diff --git a/env/ubi.c b/env/ubi.c
index 4d5ae1343defe9bccf1f9b00fc0dfc83296b1868..9399f943dc88b918d33ba3f8f824ea27f00662bf 100644 (file)
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -16,8 +16,6 @@
 #include <ubi_uboot.h>
 #undef crc32
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_CMD_SAVEENV