]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
of: unittest: Remove redundant OF_DETACHED flag setting
authorStephen Boyd <stephen.boyd@linaro.org>
Fri, 13 Oct 2017 07:44:51 +0000 (00:44 -0700)
committerRob Herring <robh@kernel.org>
Mon, 16 Oct 2017 21:49:49 +0000 (16:49 -0500)
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>
drivers/of/unittest.c

index 29a35cb1da64c070ff1b6a96a76ad54d7c4cb636..add02cfbfb88bc0487db2dd93dc3f3d7a7048e3b 100644 (file)
@@ -993,7 +993,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);
@@ -2143,7 +2142,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) {