[PATCH 2/2] of_device_is_stdout_path: split off options and support aliases

[Sascha Hauer]

On Wed, Jun 14, 2017 at 01:31:10PM +0200, Uwe Kleine-König wrote:
> Several device trees use something like:
> 
> 	stdout-path = "serial0:115200n8";
> 
> Currently of_device_is_stdout_path fails to do the right thing here
> because it expects an absolute node path and no options. So split off
> options (everything after the colon) and resolve aliases.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
>  drivers/of/base.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 592ebb015a73..e401c11a878f 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1999,6 +1999,7 @@ int of_device_is_stdout_path(struct device_d *dev)
>  {
>  	struct device_node *dn;
>  	const char *name;
> +	char *q;
>  
>  	if (!dev->device_node)
>  		return 0;
> @@ -2010,7 +2011,16 @@ int of_device_is_stdout_path(struct device_d *dev)
>  	if (!name)
>  		return 0;
>  
> -	dn = of_find_node_by_path(name);
> +	/* This could make use of strchrnul it it were available */

s/it it/if it/

> +	q = strchr(name, ':');

This results in:

drivers/of/base.c:2017:4: warning: assignment discards 'const' qualifier from pointer target type

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |