diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:04 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-15 20:50:28 -0400 |
| commit | 98b5755fb0484ac575b66784865bde2b30ea1d87 (patch) | |
| tree | a193900623bfc951c11239daf3409be84622a79c /env | |
| parent | ac358beb85362fb2fac47aaec40a7e1bca49656c (diff) | |
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>
Diffstat (limited to 'env')
| -rw-r--r-- | env/dataflash.c | 2 | ||||
| -rw-r--r-- | env/eeprom.c | 4 | ||||
| -rw-r--r-- | env/ext4.c | 2 | ||||
| -rw-r--r-- | env/fat.c | 2 | ||||
| -rw-r--r-- | env/mmc.c | 6 | ||||
| -rw-r--r-- | env/nowhere.c | 2 | ||||
| -rw-r--r-- | env/nvram.c | 1 | ||||
| -rw-r--r-- | env/ubi.c | 2 |
8 files changed, 0 insertions, 21 deletions
diff --git a/env/dataflash.c b/env/dataflash.c index 9421a6a5b2..28dcf6fa1c 100644 --- 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 2c795b9236..39adccabbe 100644 --- 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 5acdf0eda0..ee073a8b7c 100644 --- 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 @@ -31,8 +31,6 @@ # endif #endif -env_t *env_ptr; - DECLARE_GLOBAL_DATA_PTR; #ifdef CMD_SAVEENV @@ -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 1a17d6978b..d60de494e6 100644 --- 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 0f4b491fd3..ac389ace62 100644 --- 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 @@ -16,8 +16,6 @@ #include <ubi_uboot.h> #undef crc32 -env_t *env_ptr; - DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_CMD_SAVEENV |