[U-Boot] [PATCH v2 16/34] env: common: Factor out the common env_valid check

Simon Glass
2017-07-24T03:19:51Z

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>
---

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 ce6b5f927a..10c4e134f4 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);
--
2.14.0.rc0.284.gd933b75aa4-goog