Commit 53abfe67 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Linus Walleij
Browse files

pinctrl: ralink: rt2880: avoid double pointer to simplify code 



Double pointer is being used and assigned in a bit dirty way to
assign functions in pinctrl. Instead of doing this just avoid it
and use directly 'p->func' instead.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20201213161721.6514-3-sergio.paracuellos@gmail.com


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

drivers/pinctrl/ralink/pinctrl-rt2880.c

+9 −12
Original line number Original line Diff line number Diff line
@@ -193,7 +193,6 @@ static struct rt2880_pmx_func gpio_func = { 




static int rt2880_pinmux_index(struct rt2880_priv *p)

static int rt2880_pinmux_index(struct rt2880_priv *p)

{

{

	struct rt2880_pmx_func **f;

	struct rt2880_pmx_group *mux = p->groups;

	struct rt2880_pmx_group *mux = p->groups;

	int i, j, c = 0;

	int i, j, c = 0;
@@ -218,31 +217,29 @@ static int rt2880_pinmux_index(struct rt2880_priv *p) 
	p->func_count++;

	p->func_count++;





	/* allocate our function and group mapping index buffers */

	/* allocate our function and group mapping index buffers */

	f = p->func = devm_kcalloc(p->dev,

	p->func = devm_kcalloc(p->dev, p->func_count,

				   p->func_count,

			       sizeof(*p->func), GFP_KERNEL);

				   sizeof(*p->func),

				   GFP_KERNEL);

	gpio_func.groups = devm_kcalloc(p->dev, p->group_count, sizeof(int),

	gpio_func.groups = devm_kcalloc(p->dev, p->group_count, sizeof(int),

					GFP_KERNEL);

					GFP_KERNEL);

	if (!f || !gpio_func.groups)

	if (!p->func || !gpio_func.groups)

		return -1;

		return -ENOMEM;





	/* add a backpointer to the function so it knows its group */

	/* add a backpointer to the function so it knows its group */

	gpio_func.group_count = p->group_count;

	gpio_func.group_count = p->group_count;

	for (i = 0; i < gpio_func.group_count; i++)

	for (i = 0; i < gpio_func.group_count; i++)

		gpio_func.groups[i] = i;

		gpio_func.groups[i] = i;





	f[c] = &gpio_func;

	p->func[c] = &gpio_func;

	c++;

	c++;





	/* add remaining functions */

	/* add remaining functions */

	for (i = 0; i < p->group_count; i++) {

	for (i = 0; i < p->group_count; i++) {

		for (j = 0; j < p->groups[i].func_count; j++) {

		for (j = 0; j < p->groups[i].func_count; j++) {

			f[c] = &p->groups[i].func[j];

			p->func[c] = &p->groups[i].func[j];

			f[c]->groups = devm_kzalloc(p->dev, sizeof(int),

			p->func[c]->groups = devm_kzalloc(p->dev, sizeof(int),

						    GFP_KERNEL);

						    GFP_KERNEL);

			f[c]->groups[0] = i;

			p->func[c]->groups[0] = i;

			f[c]->group_count = 1;

			p->func[c]->group_count = 1;

			c++;

			c++;

		}

		}

	}

	}