env: Drop env_get_char_spec() and old, unused .get_char() implementations

Commit b2cdef4861be ("env: restore old env_get_char() behaviour")
dropped the .get_char() method from struct env_driver, but left the two
existing implementations (eeprom and nvram) in case someone would use
them by overwriting weak function env_get_char_spec().

Since this was never done in the 3.5 years, let's drop these methods and
simplify the code.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/env/eeprom.c b/env/eeprom.c
index 253bdf14284a36ef918fd635c275f29d63a2eed9..f8556a47213c8c9da8ffd0707a9727faf33fc57d 100644 (file)
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -64,24 +64,6 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
        return rcode;
 }
 
-/** Call this function from overridden env_get_char_spec() if you need
- * this functionality.
- */
-int env_eeprom_get_char(int index)
-{
-       uchar c;
-       unsigned int off = CONFIG_ENV_OFFSET;
-
-#ifdef CONFIG_ENV_OFFSET_REDUND
-       if (gd->env_valid == ENV_REDUND)
-               off = CONFIG_ENV_OFFSET_REDUND;
-#endif
-       eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
-                       off + index + offsetof(env_t, data), &c, 1);
-
-       return c;
-}
-
 static int env_eeprom_load(void)
 {
        char buf_env[CONFIG_ENV_SIZE];

diff --git a/env/env.c b/env/env.c
index e53400800606e20d3976eb5f123d51dfe131e829..91d220c3dd1f64a32cbc05b995949615a2e10f04 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -166,17 +166,12 @@ static struct env_driver *env_driver_lookup(enum env_operation op, int prio)
        return drv;
 }
 
-__weak int env_get_char_spec(int index)
-{
-       return *(uchar *)(gd->env_addr + index);
-}
-
 int env_get_char(int index)
 {
        if (gd->env_valid == ENV_INVALID)
                return default_environment[index];
        else
-               return env_get_char_spec(index);
+               return *(uchar *)(gd->env_addr + index);
 }
 
 int env_load(void)

diff --git a/env/nvram.c b/env/nvram.c
index f4126858b5b4cd700c6bdffab005cce944c123b4..261b31edfbb9303d8a8ffb9d07e322e0e003f30f 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -42,20 +42,6 @@ extern void nvram_write(long dest, const void *src, size_t count);
 static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-/** Call this function from overridden env_get_char_spec() if you need
- * this functionality.
- */
-int env_nvram_get_char(int index)
-{
-       uchar c;
-
-       nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
-
-       return c;
-}
-#endif
-
 static int env_nvram_load(void)
 {
        char buf[CONFIG_ENV_SIZE];