Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

env: Rename env_driver_lookup_default and env_get_default_location

Browse source 
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>
This commit is contained in:
Maxime Ripard 2018-01-23 21:16:51 +01:00 • committed by Tom Rini
parent 9c24dfb2b8
commit 52746c43d6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
env/env.c vendored
View file

@ -10,7 +10,7 @@
DECLARE_GLOBAL_DATA_PTR; 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; struct env_driver *drv;
const int n_ents = ll_entry_count(struct env_driver, env_driver); 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; 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) if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM)
return ENVL_EEPROM; return ENVL_EEPROM;
@ -54,12 +54,12 @@ static enum env_location env_get_default_location(void)
return ENVL_UNKNOWN; 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; struct env_driver *drv;
drv = env_driver_lookup(loc); drv = _env_driver_lookup(loc);
if (!drv) { if (!drv) {
debug("%s: No environment driver for location %d\n", __func__, debug("%s: No environment driver for location %d\n", __func__,
loc); loc);
@ -71,7 +71,7 @@ static struct env_driver *env_driver_lookup_default(void)
int env_get_char(int index) int env_get_char(int index)
{ {
struct env_driver *drv = env_driver_lookup_default(); struct env_driver *drv = env_driver_lookup();
int ret; int ret;
if (gd->env_valid == ENV_INVALID) if (gd->env_valid == ENV_INVALID)
@ -91,7 +91,7 @@ int env_get_char(int index)
int env_load(void) int env_load(void)
{ {
struct env_driver *drv = env_driver_lookup_default(); struct env_driver *drv = env_driver_lookup();
int ret = 0; int ret = 0;
if (!drv) if (!drv)
@ -110,7 +110,7 @@ int env_load(void)
int env_save(void) int env_save(void)
{ {
struct env_driver *drv = env_driver_lookup_default(); struct env_driver *drv = env_driver_lookup();
int ret; int ret;
if (!drv) if (!drv)
@ -131,7 +131,7 @@ int env_save(void)
int env_init(void) int env_init(void)
{ {
struct env_driver *drv = env_driver_lookup_default(); struct env_driver *drv = env_driver_lookup();
int ret = -ENOENT; int ret = -ENOENT;
if (!drv) if (!drv)