]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: sprd: Use scope based of_node_put() cleanups
authorPeng Fan <peng.fan@nxp.com>
Sat, 4 May 2024 13:20:03 +0000 (21:20 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 26 Jun 2024 09:56:05 +0000 (11:56 +0200)
Use scope based of_node_put() cleanup to simplify code.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/20240504-pinctrl-cleanup-v2-5-26c5f2dc1181@nxp.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sprd/pinctrl-sprd.c

index d0b6d3e655a29aab99ca833538be11a68b72f002..c4a1d99dfed0431015f34554673b9e2853a6dbd1 100644 (file)
@@ -934,7 +934,6 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
 {
        struct sprd_pinctrl_soc_info *info = sprd_pctl->info;
        struct device_node *np = sprd_pctl->dev->of_node;
-       struct device_node *child, *sub_child;
        struct sprd_pin_group *grp;
        const char **temp;
        int ret;
@@ -962,25 +961,20 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
        temp = info->grp_names;
        grp = info->groups;
 
-       for_each_child_of_node(np, child) {
+       for_each_child_of_node_scoped(np, child) {
                ret = sprd_pinctrl_parse_groups(child, sprd_pctl, grp);
-               if (ret) {
-                       of_node_put(child);
+               if (ret)
                        return ret;
-               }
 
                *temp++ = grp->name;
                grp++;
 
                if (of_get_child_count(child) > 0) {
-                       for_each_child_of_node(child, sub_child) {
+                       for_each_child_of_node_scoped(child, sub_child) {
                                ret = sprd_pinctrl_parse_groups(sub_child,
                                                                sprd_pctl, grp);
-                               if (ret) {
-                                       of_node_put(sub_child);
-                                       of_node_put(child);
+                               if (ret)
                                        return ret;
-                               }
 
                                *temp++ = grp->name;
                                grp++;