[RFC,02/10] env: Make env_driver_lookup_default private

Message ID 20171116092231.27740-3-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.
No that there's no users of env_driver_lookup_default outside of env/env.c,
we can mark that function static and remove it from the environment header.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 env/env.c             | 2 +-
 include/environment.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

Comments

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

> No that there's no users of env_driver_lookup_default outside of

> env/env.c, we can mark that function static and remove it from the

> environment header.

> 

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

> ---

>  env/env.c             | 2 +-

>  include/environment.h | 7 -------

>  2 files changed, 1 insertion(+), 8 deletions(-)

> 

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

> index 84c12e27bc3f..094538ff5b62 100644

> --- a/env/env.c

> +++ b/env/env.c

> @@ -52,7 +52,7 @@ static enum env_location

> env_get_default_location(void) return ENVL_UNKNOWN;

>  }

>  

> -struct env_driver *env_driver_lookup_default(void)

> +static struct env_driver *env_driver_lookup_default(void)

>  {

>  	enum env_location loc = env_get_default_location();

>  	struct env_driver *drv;

> diff --git a/include/environment.h b/include/environment.h

> index 7b9821638960..226e3ef2d23a 100644

> --- a/include/environment.h

> +++ b/include/environment.h

> @@ -302,13 +302,6 @@ int env_export(env_t *env_out);

>  int env_import_redund(const char *buf1, const char *buf2);

>  #endif

>  

> -/**

> - * env_driver_lookup_default() - Look up the default environment

> driver

> - *

> - * @return pointer to driver, or NULL if none (which should not

> happen)

> - */

> -struct env_driver *env_driver_lookup_default(void);

> -

>  /**

>   * env_get_char() - Get a character from the early environment

>   *


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
André Przywara Nov. 20, 2017, 9:53 a.m. | #2
Hi,

On 16/11/17 09:22, Maxime Ripard wrote:
> No that there's no users of env_driver_lookup_default outside of env/env.c,
> we can mark that function static and remove it from the environment header.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Looks good to me, but I believe you should merge this into the previous
patch. This makes it immediately obvious why we don't need this function
anymore.

Cheers,
Andre.

> ---
>  env/env.c             | 2 +-
>  include/environment.h | 7 -------
>  2 files changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/env/env.c b/env/env.c
> index 84c12e27bc3f..094538ff5b62 100644
> --- a/env/env.c
> +++ b/env/env.c
> @@ -52,7 +52,7 @@ static enum env_location env_get_default_location(void)
>  		return ENVL_UNKNOWN;
>  }
>  
> -struct env_driver *env_driver_lookup_default(void)
> +static struct env_driver *env_driver_lookup_default(void)
>  {
>  	enum env_location loc = env_get_default_location();
>  	struct env_driver *drv;
> diff --git a/include/environment.h b/include/environment.h
> index 7b9821638960..226e3ef2d23a 100644
> --- a/include/environment.h
> +++ b/include/environment.h
> @@ -302,13 +302,6 @@ int env_export(env_t *env_out);
>  int env_import_redund(const char *buf1, const char *buf2);
>  #endif
>  
> -/**
> - * env_driver_lookup_default() - Look up the default environment driver
> - *
> - * @return pointer to driver, or NULL if none (which should not happen)
> - */
> -struct env_driver *env_driver_lookup_default(void);
> -
>  /**
>   * env_get_char() - Get a character from the early environment
>   *
>

Patch

diff --git a/env/env.c b/env/env.c
index 84c12e27bc3f..094538ff5b62 100644
--- a/env/env.c
+++ b/env/env.c
@@ -52,7 +52,7 @@  static enum env_location env_get_default_location(void)
 		return ENVL_UNKNOWN;
 }
 
-struct env_driver *env_driver_lookup_default(void)
+static struct env_driver *env_driver_lookup_default(void)
 {
 	enum env_location loc = env_get_default_location();
 	struct env_driver *drv;
diff --git a/include/environment.h b/include/environment.h
index 7b9821638960..226e3ef2d23a 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -302,13 +302,6 @@  int env_export(env_t *env_out);
 int env_import_redund(const char *buf1, const char *buf2);
 #endif
 
-/**
- * env_driver_lookup_default() - Look up the default environment driver
- *
- * @return pointer to driver, or NULL if none (which should not happen)
- */
-struct env_driver *env_driver_lookup_default(void);
-
 /**
  * env_get_char() - Get a character from the early environment
  *