kevin/linux
1
Fork 0
Code

pinctrl: mediatek: Use scope based of_node_put() cleanups

Browse Source 
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>
This commit is contained in:
Peng Fan 2024-05-04 21:20:12 +08:00 committed by Linus Walleij
parent c957ae7e7e
commit 3a0278cfb4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/mediatek/pinctrl-mtk-common.c
View File

@ -621,7 +621,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
struct device_node *np_config, struct device_node *np_config,
struct pinctrl_map **map, unsigned *num_maps) struct pinctrl_map **map, unsigned *num_maps)
{ {
struct device_node *np;
unsigned reserved_maps; unsigned reserved_maps;
int ret; int ret;
@ -629,12 +628,11 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
*num_maps = 0; *num_maps = 0;
reserved_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, ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map,
&reserved_maps, num_maps); &reserved_maps, num_maps);
if (ret < 0) { if (ret < 0) {
pinctrl_utils_free_map(pctldev, *map, *num_maps); pinctrl_utils_free_map(pctldev, *map, *num_maps);
of_node_put(np);
return ret; return ret;
} }
} }

4
drivers/pinctrl/mediatek/pinctrl-paris.c
View File

@ -536,7 +536,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
struct pinctrl_map **map, struct pinctrl_map **map,
unsigned *num_maps) unsigned *num_maps)
{ {
struct device_node *np;
unsigned reserved_maps; unsigned reserved_maps;
int ret; int ret;
@ -544,13 +543,12 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
*num_maps = 0; *num_maps = 0;
reserved_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, ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map,
&reserved_maps, &reserved_maps,
num_maps); num_maps);
if (ret < 0) { if (ret < 0) {
pinctrl_utils_free_map(pctldev, *map, *num_maps); pinctrl_utils_free_map(pctldev, *map, *num_maps);
of_node_put(np);
return ret; return ret;
} }
} }