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: NTom Rini <trini@konsulko.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

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)