mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2 2/2] of_device_is_stdout_path: split off options and support aliases
Date: Wed, 14 Jun 2017 20:02:49 +0200	[thread overview]
Message-ID: <20170614180249.12644-1-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20170614113110.21604-2-u.kleine-koenig@pengutronix.de>

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

  parent reply	other threads:[~2017-06-14 18:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-14 11:31 [PATCH 1/2] of_device_is_stdout_path: simplify Uwe Kleine-König
2017-06-14 11:31 ` [PATCH 2/2] of_device_is_stdout_path: split off options and support aliases Uwe Kleine-König
2017-06-14 13:27   ` Sascha Hauer
2017-06-14 18:02   ` Uwe Kleine-König [this message]
2017-06-19  6:21 ` [PATCH 1/2] of_device_is_stdout_path: simplify Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170614180249.12644-1-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox