diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-06-14 13:31:09 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-19 08:20:54 +0200 |
| commit | 0e193b6684798e0fedf0eb0462ba9bc8059270c0 (patch) | |
| tree | fbb27998ec2c784543aac59b97f3208a82a0eaab /drivers | |
| parent | 211a5b23d9fb31930d0a2cd6a4407ede71d481b2 (diff) | |
| download | barebox-0e193b6684798e0fedf0eb0462ba9bc8059270c0.tar.gz barebox-0e193b6684798e0fedf0eb0462ba9bc8059270c0.tar.xz | |
of_device_is_stdout_path: simplify
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/base.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 33f61622ae..44a7b8b61f 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2002,6 +2002,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); @@ -2010,13 +2013,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; } /** |