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

pinctrl: st: 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>
Reviewed-by: default avatarPatrice Chotard <patrice.chotard@foss.st.com>
Link: https://lore.kernel.org/r/20240504-pinctrl-cleanup-v2-8-26c5f2dc1181@nxp.com


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

drivers/pinctrl/pinctrl-st.c

+11 −26
Original line number Diff line number Diff line
@@ -1195,10 +1195,10 @@ static int st_pctl_dt_parse_groups(struct device_node *np, 
	struct property *pp;

	struct device *dev = info->dev;

	struct st_pinconf *conf;

	struct device_node *pins;

	struct device_node *pins __free(device_node) = NULL;

	phandle bank;

	unsigned int offset;

	int i = 0, npins = 0, nr_props, ret = 0;

	int i = 0, npins = 0, nr_props;



	pins = of_get_child_by_name(np, "st,pins");

	if (!pins)
@@ -1213,8 +1213,7 @@ static int st_pctl_dt_parse_groups(struct device_node *np, 
			npins++;

		} else {

			pr_warn("Invalid st,pins in %pOFn node\n", np);

			ret = -EINVAL;

			goto out_put_node;

			return -EINVAL;

		}

	}
@@ -1223,10 +1222,8 @@ static int st_pctl_dt_parse_groups(struct device_node *np, 
	grp->pins = devm_kcalloc(dev, npins, sizeof(*grp->pins), GFP_KERNEL);

	grp->pin_conf = devm_kcalloc(dev, npins, sizeof(*grp->pin_conf), GFP_KERNEL);



	if (!grp->pins || !grp->pin_conf) {

		ret = -ENOMEM;

		goto out_put_node;

	}

	if (!grp->pins || !grp->pin_conf)

		return -ENOMEM;



	/* <bank offset mux direction rt_type rt_delay rt_clk> */

	for_each_property_of_node(pins, pp) {
@@ -1260,17 +1257,13 @@ static int st_pctl_dt_parse_groups(struct device_node *np, 
		i++;

	}



out_put_node:

	of_node_put(pins);



	return ret;

	return 0;

}



static int st_pctl_parse_functions(struct device_node *np,

			struct st_pinctrl *info, u32 index, int *grp_index)

{

	struct device *dev = info->dev;

	struct device_node *child;

	struct st_pmx_func *func;

	struct st_pctl_group *grp;

	int ret, i;
@@ -1285,16 +1278,14 @@ static int st_pctl_parse_functions(struct device_node *np, 
		return -ENOMEM;



	i = 0;

	for_each_child_of_node(np, child) {

	for_each_child_of_node_scoped(np, child) {

		func->groups[i] = child->name;

		grp = &info->groups[*grp_index];

		*grp_index += 1;

		ret = st_pctl_dt_parse_groups(child, grp, info, i++);

		if (ret) {

			of_node_put(child);

		if (ret)

			return ret;

	}

	}

	dev_info(dev, "Function[%d\t name:%s,\tgroups:%d]\n", index, func->name, func->ngroups);



	return 0;
@@ -1601,7 +1592,6 @@ static int st_pctl_probe_dt(struct platform_device *pdev, 
	int i = 0, j = 0, k = 0, bank;

	struct pinctrl_pin_desc *pdesc;

	struct device_node *np = dev->of_node;

	struct device_node *child;

	int grp_index = 0;

	int irq = 0;
@@ -1646,25 +1636,21 @@ static int st_pctl_probe_dt(struct platform_device *pdev, 
	pctl_desc->pins = pdesc;



	bank = 0;

	for_each_child_of_node(np, child) {

	for_each_child_of_node_scoped(np, child) {

		if (of_property_read_bool(child, "gpio-controller")) {

			const char *bank_name = NULL;

			char **pin_names;



			ret = st_gpiolib_register_bank(info, bank, child);

			if (ret) {

				of_node_put(child);

			if (ret)

				return ret;

			}



			k = info->banks[bank].range.pin_base;

			bank_name = info->banks[bank].range.name;



			pin_names = devm_kasprintf_strarray(dev, bank_name, ST_GPIO_PINS_PER_BANK);

			if (IS_ERR(pin_names)) {

				of_node_put(child);

			if (IS_ERR(pin_names))

				return PTR_ERR(pin_names);

			}



			for (j = 0; j < ST_GPIO_PINS_PER_BANK; j++, k++) {

				pdesc->number = k;
@@ -1678,7 +1664,6 @@ static int st_pctl_probe_dt(struct platform_device *pdev, 
							i++, &grp_index);

			if (ret) {

				dev_err(dev, "No functions found.\n");

				of_node_put(child);

				return ret;

			}

		}