[U-Boot] [PATCH v2 15/34] env: common: Drop env_get_addr()

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

This function is not used anywhere other than env_get_char(). Move the
code into that function.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

env/common.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/env/common.c b/env/common.c
index ff3f47e536..ce6b5f927a 100644
--- a/env/common.c
+++ b/env/common.c
@@ -41,17 +41,12 @@ static uchar env_get_char_init(int index)
return default_environment[index];
}

-static const uchar *env_get_addr(int index)
+static uchar env_get_char_memory(int index)
{
if (gd->env_valid)
- return (uchar *)(gd->env_addr + index);
+ return *(uchar *)(gd->env_addr + index);
else
- return &default_environment[index];
-}
-
-static uchar env_get_char_memory(int index)
-{
- return *env_get_addr(index);
+ return default_environment[index];
}

uchar env_get_char(int index)
--
2.14.0.rc0.284.gd933b75aa4-goog