Skip to content

Commit c957ae7

Browse files
MrVanlinusw
authored andcommitted
pinctrl: nomadik: Use scope based of_node_put() cleanups
Use scope based of_node_put() cleanup to simplify code. Signed-off-by: Peng Fan <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 3dcc01b commit c957ae7

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

drivers/pinctrl/nomadik/pinctrl-abx500.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,19 +811,17 @@ static int abx500_dt_node_to_map(struct pinctrl_dev *pctldev,
811811
struct pinctrl_map **map, unsigned *num_maps)
812812
{
813813
unsigned reserved_maps;
814-
struct device_node *np;
815814
int ret;
816815

817816
reserved_maps = 0;
818817
*map = NULL;
819818
*num_maps = 0;
820819

821-
for_each_child_of_node(np_config, np) {
820+
for_each_child_of_node_scoped(np_config, np) {
822821
ret = abx500_dt_subnode_to_map(pctldev, np, map,
823822
&reserved_maps, num_maps);
824823
if (ret < 0) {
825824
pinctrl_utils_free_map(pctldev, *map, *num_maps);
826-
of_node_put(np);
827825
return ret;
828826
}
829827
}

drivers/pinctrl/nomadik/pinctrl-nomadik.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,19 +804,17 @@ static int nmk_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
804804
unsigned int *num_maps)
805805
{
806806
unsigned int reserved_maps;
807-
struct device_node *np;
808807
int ret;
809808

810809
reserved_maps = 0;
811810
*map = NULL;
812811
*num_maps = 0;
813812

814-
for_each_child_of_node(np_config, np) {
813+
for_each_child_of_node_scoped(np_config, np) {
815814
ret = nmk_pinctrl_dt_subnode_to_map(pctldev, np, map,
816815
&reserved_maps, num_maps);
817816
if (ret < 0) {
818817
pinctrl_utils_free_map(pctldev, *map, *num_maps);
819-
of_node_put(np);
820818
return ret;
821819
}
822820
}

0 commit comments

Comments
 (0)