diff mbox

[U-Boot,v2,18/34] env: common: Drop env_get_char_memory()

Message ID 20170724032009.43994-19-sjg@chromium.org
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass July 24, 2017, 3:19 a.m. UTC
This function is the same as env_get_char_spec() apart from dropping the
brackets. Drop the brackets from env_get_char_spec() and use that instead
of env_get_char_memory().

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

Changes in v2: None

 env/common.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Tom Rini July 26, 2017, 4:14 p.m. UTC | #1
On Sun, Jul 23, 2017 at 09:19:53PM -0600, Simon Glass wrote:

> This function is the same as env_get_char_spec() apart from dropping the
> brackets. Drop the brackets from env_get_char_spec() and use that instead
> of env_get_char_memory().
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
diff mbox

Patch

diff --git a/env/common.c b/env/common.c
index e919269c7f..7ed4bb28dd 100644
--- a/env/common.c
+++ b/env/common.c
@@ -28,11 +28,6 @@  struct hsearch_data env_htab = {
 };
 
 __weak uchar env_get_char_spec(int index)
-{
-	return *((uchar *)(gd->env_addr + index));
-}
-
-static uchar env_get_char_memory(int index)
 {
 	return *(uchar *)(gd->env_addr + index);
 }
@@ -42,8 +37,6 @@  uchar env_get_char(int index)
 	/* 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_spec(index);
 }