The check for gd->env_valid is used in both the 'if' and 'else' part of env_get_char(). Move it into that function instead for simplicity. Drop that code from the two leaf functions.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
env/common.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/env/common.c b/env/common.c index 2e94dd71e2..bfa8cfb143 100644 --- a/env/common.c +++ b/env/common.c @@ -34,25 +34,20 @@ __weak uchar env_get_char_spec(int index)
static uchar env_get_char_init(int index) { - /* if crc was bad, use the default environment */ - if (gd->env_valid) - return env_get_char_spec(index); - else - return default_environment[index]; + return env_get_char_spec(index); }
static uchar env_get_char_memory(int index) { - if (gd->env_valid) - return *(uchar *)(gd->env_addr + index); - else - return default_environment[index]; + return *(uchar *)(gd->env_addr + index); }
uchar env_get_char(int index) { - /* if relocated to RAM */ - if (gd->flags & GD_FLG_RELOC) + /* if env is not set up, or crc was bad, use the default environment */ + if (!gd->env_valid) + return default_environment[index]; + else if (gd->flags & GD_FLG_RELOC) /* if relocated to RAM */ return env_get_char_memory(index); else return env_get_char_init(index);