From 0e193b6684798e0fedf0eb0462ba9bc8059270c0 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Wed, 14 Jun 2017 13:31:09 +0200 Subject: of_device_is_stdout_path: simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sascha Hauer --- 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 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; } /** -- cgit v1.2.3