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

diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index 80e3ac333136188dbba58222169d65c9be36bdf8..47f62c89955ab640b07e162305e0398fe250bb7e 100644 (file)
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -811,19 +811,17 @@ static int abx500_dt_node_to_map(struct pinctrl_dev *pctldev,
                                 struct pinctrl_map **map, unsigned *num_maps)
 {
        unsigned reserved_maps;
-       struct device_node *np;
        int ret;
 
        reserved_maps = 0;
        *map = NULL;
        *num_maps = 0;
 
-       for_each_child_of_node(np_config, np) {
+       for_each_child_of_node_scoped(np_config, np) {
                ret = abx500_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/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index cb0f0d5a5e45686dccfc6abb54ac2bd922c9ddde..fa78d5ecc6855c655aa8b0f359d74f674e1448bc 100644 (file)
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -804,19 +804,17 @@ static int nmk_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
                                      unsigned int *num_maps)
 {
        unsigned int reserved_maps;
-       struct device_node *np;
        int ret;
 
        reserved_maps = 0;
        *map = NULL;
        *num_maps = 0;
 
-       for_each_child_of_node(np_config, np) {
+       for_each_child_of_node_scoped(np_config, np) {
                ret = nmk_pinctrl_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;
                }
        }