From 0219fb61c1378152b11f0e21e1e4db89081f15da Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2017 12:21:52 -0600 Subject: [PATCH] env: common: Drop env_get_addr() This function is not used anywhere other than env_get_char(). Move the code into that function. Reviewed-by: Tom Rini Signed-off-by: Simon Glass --- env/common.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/env/common.c b/env/common.c index 5a17e52615..2e94dd71e2 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) -{ - if (gd->env_valid) - return (uchar *)(gd->env_addr + index); - else - return &default_environment[index]; -} - static uchar env_get_char_memory(int index) { - return *env_get_addr(index); + if (gd->env_valid) + return *(uchar *)(gd->env_addr + index); + else + return default_environment[index]; } uchar env_get_char(int index)