blob: c0bdf0153cfc88292fba6f2b737327dc63a8e8ed [file] [log] [blame]
From f3a207d0ce61f6c38a50ae1e3a7e6a499c342518 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <stephen.boyd@linaro.org>
Date: Fri, 13 Oct 2017 00:44:51 -0700
Subject: [PATCH 0903/1795] of: unittest: Remove redundant OF_DETACHED flag
setting
of_fdt_unflatten_tree() already sets the flag on the node to
OF_DETACHED, because of_fdt_unflatten_tree() calls
__unflatten_device_tree() with the detached bool set to true.
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Reviewed-by: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
(cherry picked from commit e0f4145685ec7b477f6166ee819125107388a249)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/of/unittest.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 985a85f281a8..4db57549baf8 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -994,7 +994,6 @@ static int __init unittest_data_add(void)
pr_warn("%s: No tree to attach; not running tests\n", __func__);
return -ENODATA;
}
- of_node_set_flag(unittest_data_node, OF_DETACHED);
rc = of_resolve_phandles(unittest_data_node);
if (rc) {
pr_err("%s: Failed to resolve phandles (rc=%i)\n", __func__, rc);
@@ -2144,7 +2143,6 @@ static int __init overlay_data_add(int onum)
ret = 0;
goto out_free_data;
}
- of_node_set_flag(info->np_overlay, OF_DETACHED);
ret = of_resolve_phandles(info->np_overlay);
if (ret) {
--
2.19.0