aboutsummaryrefslogtreecommitdiff
path: root/env/env.c
diff options
context:
space:
mode:
authorMarek BehĂșn2021-10-17 17:36:27 +0200
committerSimon Glass2021-10-21 12:50:48 -0600
commitdd1c5a7f80baf69ac94122acb3202bdcf14fec92 (patch)
treefd7de34daba296cf78758fa6d00dfb666b69bc0f /env/env.c
parent6dc1e2f10c7ca8ba7caf5444efeb5bb015837829 (diff)
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>
Diffstat (limited to 'env/env.c')
-rw-r--r--env/env.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/env/env.c b/env/env.c
index e5340080060..91d220c3dd1 100644
--- 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)