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 1/2] of_device_is_stdout_path: simplify
Date: Wed, 14 Jun 2017 13:31:09 +0200	[thread overview]
Message-ID: <20170614113110.21604-1-u.kleine-koenig@pengutronix.de> (raw)

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

             reply	other threads:[~2017-06-14 11:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-14 11:31 Uwe Kleine-König [this message]
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   ` [PATCH v2 " Uwe Kleine-König
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=20170614113110.21604-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