Commit 3a0278cf authored by Peng Fan's avatar Peng Fan Committed by Linus Walleij
Browse files

pinctrl: mediatek: Use scope based of_node_put() cleanups 



Use scope based of_node_put() cleanup to simplify code.

Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/20240504-pinctrl-cleanup-v2-14-26c5f2dc1181@nxp.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c957ae7e

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}

drivers/pinctrl/mediatek/pinctrl-paris.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}