Message ID | 20170724032009.43994-16-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On Sun, Jul 23, 2017 at 09:19:50PM -0600, Simon Glass wrote: > 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> Reviewed-by: Tom Rini <trini@konsulko.com>
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)
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(-)