Commit 4ec2315d authored by Koichiro Den's avatar Koichiro Den Committed by Bartosz Golaszewski
Browse files

gpio: aggregator: rename 'name' to 'key' in gpio_aggregator_parse() 



Rename the local variable 'name' in gpio_aggregator_parse() to 'key'
because struct gpio_aggregator_line now uses the 'name' field for the
custom line name and the local variable actually represents a 'key'.
This change prepares for the next but one commit.

No functional change.

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarKoichiro Den <koichiro.den@canonical.com>
Link: https://lore.kernel.org/r/20250407043019.4105613-6-koichiro.den@canonical.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 86f162e7

drivers/gpio/gpio-aggregator.c

+6 −6
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static struct configfs_subsystem gpio_aggregator_subsys = { 
static int gpio_aggregator_parse(struct gpio_aggregator *aggr)

{

	char *args = skip_spaces(aggr->args);

	char *name, *offsets, *p;

	char *key, *offsets, *p;

	unsigned int i, n = 0;

	int error = 0;
@@ -1005,18 +1005,18 @@ static int gpio_aggregator_parse(struct gpio_aggregator *aggr) 
	if (!bitmap)

		return -ENOMEM;



	args = next_arg(args, &name, &p);

	args = next_arg(args, &key, &p);

	while (*args) {

		args = next_arg(args, &offsets, &p);



		p = get_options(offsets, 0, &error);

		if (error == 0 || *p) {

			/* Named GPIO line */

			error = gpio_aggregator_add_gpio(aggr, name, U16_MAX, &n);

			error = gpio_aggregator_add_gpio(aggr, key, U16_MAX, &n);

			if (error)

				return error;



			name = offsets;

			key = offsets;

			continue;

		}
@@ -1028,12 +1028,12 @@ static int gpio_aggregator_parse(struct gpio_aggregator *aggr) 
		}



		for_each_set_bit(i, bitmap, AGGREGATOR_MAX_GPIOS) {

			error = gpio_aggregator_add_gpio(aggr, name, i, &n);

			error = gpio_aggregator_add_gpio(aggr, key, i, &n);

			if (error)

				return error;

		}



		args = next_arg(args, &name, &p);

		args = next_arg(args, &key, &p);

	}



	if (!n) {