[PATCH 1/2] of_device_is_stdout_path: simplify

[PATCH 1/2] of_device_is_stdout_path: simplify

[Uwe Kleine-König]

Test for dev->device_node being NULL earlier which at the end of the
function allows to simplify the calculation of the return value

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/of/base.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index c9bdd91810f2..592ebb015a73 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2000,6 +2000,9 @@ int of_device_is_stdout_path(struct device_d *dev)
 	struct device_node *dn;
 	const char *name;
 
+	if (!dev->device_node)
+		return 0;
+
 	name = of_get_property(of_chosen, "stdout-path", NULL);
 	if (!name)
 		name = of_get_property(of_chosen, "linux,stdout-path", NULL);
@@ -2008,13 +2011,8 @@ int of_device_is_stdout_path(struct device_d *dev)
 		return 0;
 
 	dn = of_find_node_by_path(name);
-	if (!dn)
-		return 0;
 
-	if (dn == dev->device_node)
-		return 1;
-
-	return 0;
+	return dn == dev->device_node;
 }
 
 /**
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Uwe Kleine-König]

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@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 */
+	q = strchr(name, ':');
+	if (!q)
+		q = name + strlen(name);
+
+	q = xstrndup(name, q - name);
+
+	dn = of_find_node_by_path_or_alias(NULL, q);
+
+	free(q);
 
 	return dn == dev->device_node;
 }
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [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@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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Uwe Kleine-König]

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@pengutronix.de>
---
Changes since (implicit) v1, sent with Message-Id: 20170614113110.21604-2-u.kleine-koenig@pengutronix.de:

 - fix typo
 - sort out constness issues

 drivers/of/base.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 592ebb015a73..a2d75d40bd67 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1999,6 +1999,8 @@ int of_device_is_stdout_path(struct device_d *dev)
 {
 	struct device_node *dn;
 	const char *name;
+	const char *p;
+	char *q;
 
 	if (!dev->device_node)
 		return 0;
@@ -2010,7 +2012,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 if it were available */
+	p = strchr(name, ':');
+	if (!p)
+		p = name + strlen(name);
+
+	q = xstrndup(name, p - name);
+
+	dn = of_find_node_by_path_or_alias(NULL, q);
+
+	free(q);
 
 	return dn == dev->device_node;
 }
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] of_device_is_stdout_path: simplify

[Sascha Hauer]

On Wed, Jun 14, 2017 at 01:31:09PM +0200, Uwe Kleine-König wrote:
> Test for dev->device_node being NULL earlier which at the end of the
> function allows to simplify the calculation of the return value
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/of/base.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index c9bdd91810f2..592ebb015a73 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -2000,6 +2000,9 @@ int of_device_is_stdout_path(struct device_d *dev)
>  	struct device_node *dn;
>  	const char *name;
>  
> +	if (!dev->device_node)
> +		return 0;
> +
>  	name = of_get_property(of_chosen, "stdout-path", NULL);
>  	if (!name)
>  		name = of_get_property(of_chosen, "linux,stdout-path", NULL);
> @@ -2008,13 +2011,8 @@ int of_device_is_stdout_path(struct device_d *dev)
>  		return 0;
>  
>  	dn = of_find_node_by_path(name);
> -	if (!dn)
> -		return 0;
>  
> -	if (dn == dev->device_node)
> -		return 1;
> -
> -	return 0;
> +	return dn == dev->device_node;
>  }
>  
>  /**
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox