Skip to content

Commit 11eefc0

Browse files
MrVanlinusw
authored andcommitted
pinctrl: tegra: Use scope based of_node_put() cleanups
Use scope based of_node_put() cleanup to simplify code. Signed-off-by: Peng Fan <[email protected]> Acked-by: Thierry Reding <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 41f60a6 commit 11eefc0

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

drivers/pinctrl/tegra/pinctrl-tegra-xusb.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,20 +238,17 @@ static int tegra_xusb_padctl_dt_node_to_map(struct pinctrl_dev *pinctrl,
238238
{
239239
struct tegra_xusb_padctl *padctl = pinctrl_dev_get_drvdata(pinctrl);
240240
unsigned int reserved_maps = 0;
241-
struct device_node *np;
242241
int err;
243242

244243
*num_maps = 0;
245244
*maps = NULL;
246245

247-
for_each_child_of_node(parent, np) {
246+
for_each_child_of_node_scoped(parent, np) {
248247
err = tegra_xusb_padctl_parse_subnode(padctl, np, maps,
249248
&reserved_maps,
250249
num_maps);
251-
if (err < 0) {
252-
of_node_put(np);
250+
if (err < 0)
253251
return err;
254-
}
255252
}
256253

257254
return 0;

drivers/pinctrl/tegra/pinctrl-tegra.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,18 @@ static int tegra_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
188188
unsigned *num_maps)
189189
{
190190
unsigned reserved_maps;
191-
struct device_node *np;
192191
int ret;
193192

194193
reserved_maps = 0;
195194
*map = NULL;
196195
*num_maps = 0;
197196

198-
for_each_child_of_node(np_config, np) {
197+
for_each_child_of_node_scoped(np_config, np) {
199198
ret = tegra_pinctrl_dt_subnode_to_map(pctldev, np, map,
200199
&reserved_maps, num_maps);
201200
if (ret < 0) {
202201
pinctrl_utils_free_map(pctldev, *map,
203202
*num_maps);
204-
of_node_put(np);
205203
return ret;
206204
}
207205
}

0 commit comments

Comments
 (0)