Commit 11eefc0a authored by Peng Fan's avatar Peng Fan Committed by Linus Walleij
Browse files

pinctrl: tegra: 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>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/20240504-pinctrl-cleanup-v2-2-26c5f2dc1181@nxp.com


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

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

+2 −5
Original line number Diff line number Diff line
@@ -238,21 +238,18 @@ static int tegra_xusb_padctl_dt_node_to_map(struct pinctrl_dev *pinctrl, 
{

	struct tegra_xusb_padctl *padctl = pinctrl_dev_get_drvdata(pinctrl);

	unsigned int reserved_maps = 0;

	struct device_node *np;

	int err;



	*num_maps = 0;

	*maps = NULL;



	for_each_child_of_node(parent, np) {

	for_each_child_of_node_scoped(parent, np) {

		err = tegra_xusb_padctl_parse_subnode(padctl, np, maps,

						      &reserved_maps,

						      num_maps);

		if (err < 0) {

			of_node_put(np);

		if (err < 0)

			return err;

	}

	}



	return 0;

}

drivers/pinctrl/tegra/pinctrl-tegra.c

+1 −3
Original line number Diff line number Diff line
@@ -188,20 +188,18 @@ static int tegra_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, 
					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 = tegra_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;

		}

	}