From: Frank Rowand <frank.rowand@sony.com>
Date: Thu, 24 Jan 2019 23:22:13 +0000 (-0800)
Subject: of: unittest: remove report of expected error
X-Git-Tag: v5.15~6821^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd25ffdfd0b520f25d5c532e962dfc20d58cf4f5;p=platform%2Fkernel%2Flinux-starfive.git

of: unittest: remove report of expected error

update_node_properties() reports an error when the test data contains
a node (such as "/aliases") that already exists in the base devicetree.
The error is caused by of_fdt_unflatten_tree() autogenerating the
"name" property, thus both the existing node and the new node will
have a property with the same name.  Suppress reporting the known
error.

Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 8442738..3249fe2 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1116,9 +1116,12 @@ static void update_node_properties(struct device_node *np,
 	for (prop = np->properties; prop != NULL; prop = save_next) {
 		save_next = prop->next;
 		ret = of_add_property(dup, prop);
-		if (ret)
+		if (ret) {
+			if (ret == -EEXIST && !strcmp(prop->name, "name"))
+				continue;
 			pr_err("unittest internal error: unable to add testdata property %pOF/%s",
 			       np, prop->name);
+		}
 	}
 }