From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Sun, 23 Jul 2017 16:55:48 +0000 (+0300)
Subject: of: base: use of_property_read_string()
X-Git-Tag: v5.15~10491^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0d9d92f9ce60cd070a62c136914e6fe9d20d49d;p=platform%2Fkernel%2Flinux-starfive.git

of: base: use of_property_read_string()

of_alias_scan() can use of_property_read_string() -- using the modern DT API
adds some prop sanity checks as a bonus; it does add couple LoCs but only
because the original code violated the 80-column limit...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 830f8d2..260d33c 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1662,11 +1662,13 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 
 	if (of_chosen) {
 		/* linux,stdout-path and /aliases/stdout are for legacy compatibility */
-		const char *name = of_get_property(of_chosen, "stdout-path", NULL);
-		if (!name)
-			name = of_get_property(of_chosen, "linux,stdout-path", NULL);
+		const char *name = NULL;
+
+		if (of_property_read_string(of_chosen, "stdout-path", &name))
+			of_property_read_string(of_chosen, "linux,stdout-path",
+						&name);
 		if (IS_ENABLED(CONFIG_PPC) && !name)
-			name = of_get_property(of_aliases, "stdout", NULL);
+			of_property_read_string(of_aliases, "stdout", &name);
 		if (name)
 			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
 	}