]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
of: overlay: Make node skipping in init_overlay_changeset() clearer
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 8 Dec 2017 13:13:03 +0000 (14:13 +0100)
committerRob Herring <robh@kernel.org>
Fri, 8 Dec 2017 15:32:18 +0000 (09:32 -0600)
Make it more clear that nodes without "__overlay__" subnodes are
skipped, by reverting the logic and using continue.
This also reduces indentation level.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/overlay.c

index 83bb2edfc65cac5dc7f32250b1c39fd41e34ce03..3981b7da4fa90e6d9d0b62c8d170ceb9589b7e3c 100644 (file)
@@ -573,18 +573,19 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs,
        cnt = 0;
        for_each_child_of_node(tree, node) {
                overlay_node = of_get_child_by_name(node, "__overlay__");
-               if (overlay_node) {
-                       fragment = &fragments[cnt];
-                       fragment->overlay = overlay_node;
-                       fragment->target = find_target_node(node);
-                       if (!fragment->target) {
-                               of_node_put(fragment->overlay);
-                               ret = -EINVAL;
-                               goto err_free_fragments;
-                       }
+               if (!overlay_node)
+                       continue;
 
-                       cnt++;
+               fragment = &fragments[cnt];
+               fragment->overlay = overlay_node;
+               fragment->target = find_target_node(node);
+               if (!fragment->target) {
+                       of_node_put(fragment->overlay);
+                       ret = -EINVAL;
+                       goto err_free_fragments;
                }
+
+               cnt++;
        }
 
        /*