pinctrl: mediatek: Use scope based of_node_put() cleanups

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-14-26c5f2dc1181@nxp.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index d39afc122516f12b9965208bcdf11c42565d7205..91edb539925a49b4302866b9ac36f580cc189fb5 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -621,7 +621,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
                                 struct device_node *np_config,
                                 struct pinctrl_map **map, unsigned *num_maps)
 {
-       struct device_node *np;
        unsigned reserved_maps;
        int ret;
 
@@ -629,12 +628,11 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
        *num_maps = 0;
        reserved_maps = 0;
 
-       for_each_child_of_node(np_config, np) {
+       for_each_child_of_node_scoped(np_config, np) {
                ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map,
                                &reserved_maps, num_maps);
                if (ret < 0) {
                        pinctrl_utils_free_map(pctldev, *map, *num_maps);
-                       of_node_put(np);
                        return ret;
                }
        }

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index b19bc391705ee079939f34ab03d554160d97c234..e12316c4269805b931310fce157e899663a39976 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -536,7 +536,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
                                    struct pinctrl_map **map,
                                    unsigned *num_maps)
 {
-       struct device_node *np;
        unsigned reserved_maps;
        int ret;
 
@@ -544,13 +543,12 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
        *num_maps = 0;
        reserved_maps = 0;
 
-       for_each_child_of_node(np_config, np) {
+       for_each_child_of_node_scoped(np_config, np) {
                ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map,
                                                  &reserved_maps,
                                                  num_maps);
                if (ret < 0) {
                        pinctrl_utils_free_map(pctldev, *map, *num_maps);
-                       of_node_put(np);
                        return ret;
                }
        }