Re: [PATCH 2/3] bootsource: add function to get device_node we booted from

[Marco Felsch <m.felsch@pengutronix.de>]

On 24-02-19, Sascha Hauer wrote:
> We have a relation between the bootsource and the corresponding
> device_node. Add a function to get the device_node we booted from.
> This is already open coded in of_fixup_bootargs_bootsource(),
> use the newly created function for it.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  common/bootsource.c  | 14 ++++++++++++++
>  common/oftree.c      |  7 +------
>  include/bootsource.h |  1 +
>  3 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/common/bootsource.c b/common/bootsource.c
> index da528a5b9b..5666d8d30d 100644
> --- a/common/bootsource.c
> +++ b/common/bootsource.c
> @@ -108,6 +108,20 @@ char *bootsource_get_alias_name(void)
>  	return basprintf("%s%d", stem, bootsource_instance);
>  }
>  
> +struct device_node *bootsource_of_node_get(struct device_node *root)
> +{
> +	struct device_node *np;
> +	char *alias_name;
> +
> +	alias_name = bootsource_get_alias_name();

	if (!alias_name) {
		pr_warn("No alias found for bootsource\n");
		return 0;
	}

Regards,
  Marco

> +
> +	np = of_find_node_by_alias(root, alias_name);
> +
> +	free(alias_name);
> +
> +	return np;
> +}
> +
>  void bootsource_set_alias_name(const char *name)
>  {
>  	bootsource_alias_name = name;
> diff --git a/common/oftree.c b/common/oftree.c
> index 51eebd36bd..c12b3cfb16 100644
> --- a/common/oftree.c
> +++ b/common/oftree.c
> @@ -124,14 +124,10 @@ void of_print_cmdline(struct device_node *root)
>  static int of_fixup_bootargs_bootsource(struct device_node *root,
>  					struct device_node *chosen)
>  {
> -	char *alias_name = bootsource_get_alias_name();
>  	struct device_node *bootsource;
>  	int ret = 0;
>  
> -	if (!alias_name)
> -		return 0;
> -
> -	bootsource = of_find_node_by_alias(root, alias_name);
> +	bootsource = bootsource_of_node_get(root);
>  	/*
>  	 * If kernel DTB doesn't have the appropriate alias set up,
>  	 * give up and exit early. No error is reported.
> @@ -140,7 +136,6 @@ static int of_fixup_bootargs_bootsource(struct device_node *root,
>  		ret = of_set_property(chosen, "bootsource", bootsource->full_name,
>  				      strlen(bootsource->full_name) + 1, true);
>  
> -	free(alias_name);
>  	return ret;
>  }
>  
> diff --git a/include/bootsource.h b/include/bootsource.h
> index f2ab3a2ad4..33ad269460 100644
> --- a/include/bootsource.h
> +++ b/include/bootsource.h
> @@ -33,6 +33,7 @@ char *bootsource_get_alias_name(void);
>  const char *bootsource_to_string(enum bootsource src);
>  const char *bootsource_get_alias_stem(enum bootsource bs);
>  int bootsource_of_alias_xlate(enum bootsource bs, int instance);
> +struct device_node *bootsource_of_node_get(struct device_node *root);
>  
>  /**
>   * bootsource_set - set bootsource with optional DT mapping table
> -- 
> 2.39.2
> 
> 
>