Commit 02f11713 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Linus Walleij
Browse files

pinctrl: imx: prepare for making "group_names" in "function_desc" const 



The plan for "struct function_desc" is to make its "group_names"
/double/ const. That will allow drivers to use it with static const
data.

This imx change is required to avoid:
drivers/pinctrl/freescale/pinctrl-imx.c: In function 'imx_pinctrl_parse_functions':
drivers/pinctrl/freescale/pinctrl-imx.c:672:24: error: assignment of read-only location '*(func->group_names + (sizetype)(i * 4))'
  672 |   func->group_names[i] = child->name;
      |                        ^

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20211216162206.8027-1-zajec5@gmail.com


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

drivers/pinctrl/freescale/pinctrl-imx.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -648,6 +648,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, 
	struct device_node *child;

	struct device_node *child;

	struct function_desc *func;

	struct function_desc *func;

	struct group_desc *grp;

	struct group_desc *grp;

	const char **group_names;

	u32 i = 0;

	u32 i = 0;





	dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np);

	dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np);
@@ -663,14 +664,16 @@ static int imx_pinctrl_parse_functions(struct device_node *np, 
		dev_err(ipctl->dev, "no groups defined in %pOF\n", np);

		dev_err(ipctl->dev, "no groups defined in %pOF\n", np);

		return -EINVAL;

		return -EINVAL;

	}

	}

	func->group_names = devm_kcalloc(ipctl->dev, func->num_group_names,



	group_names = devm_kcalloc(ipctl->dev, func->num_group_names,

				   sizeof(char *), GFP_KERNEL);

				   sizeof(char *), GFP_KERNEL);

	if (!func->group_names)

	if (!func->group_names)

		return -ENOMEM;

		return -ENOMEM;

	for_each_child_of_node(np, child)

		group_names[i] = child->name;

	func->group_names = group_names;





	for_each_child_of_node(np, child) {

	for_each_child_of_node(np, child) {

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



		grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),

		grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),

				   GFP_KERNEL);

				   GFP_KERNEL);

		if (!grp) {

		if (!grp) {