[RFC,01/10] cmd: nvedit: Get rid of the env lookup

Message ID 20171116092231.27740-2-maxime.ripard@free-electrons.com
State New
Headers show
Series
  • env: Multiple env support and env transition for sunxi
Related show

Commit Message

Maxime Ripard Nov. 16, 2017, 9:22 a.m.
The nvedit command is the only user of env_driver_lookup_default outside of
the environment code itself, and it uses it only to print the environment
it's about to save to during env save.

As we're about to rework the environment to be able to handle multiple
environment sources, we might not have an idea of what environment backend
is going to be used before trying (and possibly failing for some).

Therefore, it makes sense to remove that message and move it to the
env_save function itself. As a side effect, we also can get rid of the call
to env_driver_lookup default that is also about to get refactored.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 cmd/nvedit.c | 4 ----
 env/env.c    | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Lukasz Majewski Nov. 17, 2017, 9:12 a.m. | #1
On Thu, 16 Nov 2017 10:22:22 +0100
Maxime Ripard <maxime.ripard@free-electrons.com> wrote:

> The nvedit command is the only user of env_driver_lookup_default

> outside of the environment code itself, and it uses it only to print

> the environment it's about to save to during env save.

> 

> As we're about to rework the environment to be able to handle multiple

> environment sources, we might not have an idea of what environment

> backend is going to be used before trying (and possibly failing for

> some).

> 

> Therefore, it makes sense to remove that message and move it to the

> env_save function itself. As a side effect, we also can get rid of

> the call to env_driver_lookup default that is also about to get

> refactored.

> 

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

> ---

>  cmd/nvedit.c | 4 ----

>  env/env.c    | 2 ++

>  2 files changed, 2 insertions(+), 4 deletions(-)

> 

> diff --git a/cmd/nvedit.c b/cmd/nvedit.c

> index 4e79d03856fe..a690d743cd46 100644

> --- a/cmd/nvedit.c

> +++ b/cmd/nvedit.c

> @@ -708,10 +708,6 @@ ulong env_get_ulong(const char *name, int base,

> ulong default_val) static int do_env_save(cmd_tbl_t *cmdtp, int flag,

> int argc, char * const argv[])

>  {

> -	struct env_driver *env = env_driver_lookup_default();

> -

> -	printf("Saving Environment to %s...\n", env->name);

> -

>  	return env_save() ? 1 : 0;

>  }

>  

> diff --git a/env/env.c b/env/env.c

> index 76a5608628fc..84c12e27bc3f 100644

> --- a/env/env.c

> +++ b/env/env.c

> @@ -115,6 +115,8 @@ int env_save(void)

>  		return -ENODEV;

>  	if (!drv->save)

>  		return -ENOSYS;

> +

> +	printf("Saving Environment to %s...\n", drv->name);

>  	ret = drv->save();

>  	if (ret) {

>  		debug("%s: Environment failed to save (err=%d)\n",

> __func__,


Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de

Patch

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 4e79d03856fe..a690d743cd46 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -708,10 +708,6 @@  ulong env_get_ulong(const char *name, int base, ulong default_val)
 static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
 		       char * const argv[])
 {
-	struct env_driver *env = env_driver_lookup_default();
-
-	printf("Saving Environment to %s...\n", env->name);
-
 	return env_save() ? 1 : 0;
 }
 
diff --git a/env/env.c b/env/env.c
index 76a5608628fc..84c12e27bc3f 100644
--- a/env/env.c
+++ b/env/env.c
@@ -115,6 +115,8 @@  int env_save(void)
 		return -ENODEV;
 	if (!drv->save)
 		return -ENOSYS;
+
+	printf("Saving Environment to %s...\n", drv->name);
 	ret = drv->save();
 	if (ret) {
 		debug("%s: Environment failed to save (err=%d)\n", __func__,