[PATCH 1/2] of_device_is_stdout_path: simplify
Uwe Kleine-König
u.kleine-koenig at pengutronix.de
Wed Jun 14 04:31:09 PDT 2017
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 at 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
More information about the barebox
mailing list