summaryrefslogtreecommitdiffstats
path: root/env
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2018-01-23 21:16:51 +0100
committerTom Rini <trini@konsulko.com>2018-01-27 09:19:11 -0500
commit52746c43d6aeaa13a39b5cfbd05fce5ee47fbfdc (patch)
treef6ab1e47f64700ebeff62f228d09a5d686c770d9 /env
parent9c24dfb2b80cba73b79da36321eb23f47d4a9aa3 (diff)
downloadu-boot-52746c43d6aeaa13a39b5cfbd05fce5ee47fbfdc.tar.gz
u-boot-52746c43d6aeaa13a39b5cfbd05fce5ee47fbfdc.tar.xz
u-boot-52746c43d6aeaa13a39b5cfbd05fce5ee47fbfdc.zip
env: Rename env_driver_lookup_default and env_get_default_location
The env_driver_lookup_default and env_get_default_location functions are about to get refactored to support loading from multiple environment. The name is therefore not really well suited anymore. Drop the default part to be a bit more relevant. Reviewed-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'env')
-rw-r--r--env/env.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/env/env.c b/env/env.c
index 6195d3b2f3..5a71f435f3 100644
--- a/env/env.c
+++ b/env/env.c
@@ -10,7 +10,7 @@
DECLARE_GLOBAL_DATA_PTR;
-static struct env_driver *env_driver_lookup(enum env_location loc)
+static struct env_driver *_env_driver_lookup(enum env_location loc)
{
struct env_driver *drv;
const int n_ents = ll_entry_count(struct env_driver, env_driver);
@@ -26,7 +26,7 @@ static struct env_driver *env_driver_lookup(enum env_location loc)
return NULL;
}
-static enum env_location env_get_default_location(void)
+static enum env_location env_get_location(void)
{
if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM)
return ENVL_EEPROM;
@@ -54,12 +54,12 @@ static enum env_location env_get_default_location(void)
return ENVL_UNKNOWN;
}
-static struct env_driver *env_driver_lookup_default(void)
+static struct env_driver *env_driver_lookup(void)
{
- enum env_location loc = env_get_default_location();
+ enum env_location loc = env_get_location();
struct env_driver *drv;
- drv = env_driver_lookup(loc);
+ drv = _env_driver_lookup(loc);
if (!drv) {
debug("%s: No environment driver for location %d\n", __func__,
loc);
@@ -71,7 +71,7 @@ static struct env_driver *env_driver_lookup_default(void)
int env_get_char(int index)
{
- struct env_driver *drv = env_driver_lookup_default();
+ struct env_driver *drv = env_driver_lookup();
int ret;
if (gd->env_valid == ENV_INVALID)
@@ -91,7 +91,7 @@ int env_get_char(int index)
int env_load(void)
{
- struct env_driver *drv = env_driver_lookup_default();
+ struct env_driver *drv = env_driver_lookup();
int ret = 0;
if (!drv)
@@ -110,7 +110,7 @@ int env_load(void)
int env_save(void)
{
- struct env_driver *drv = env_driver_lookup_default();
+ struct env_driver *drv = env_driver_lookup();
int ret;
if (!drv)
@@ -131,7 +131,7 @@ int env_save(void)
int env_init(void)
{
- struct env_driver *drv = env_driver_lookup_default();
+ struct env_driver *drv = env_driver_lookup();
int ret = -ENOENT;
if (!drv)