gpio: aggregator: rename 'name' to 'key' in gpio_aggregator_parse()
authorKoichiro Den <koichiro.den@canonical.com>
Mon, 7 Apr 2025 04:30:15 +0000 (13:30 +0900)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 9 Apr 2025 14:57:29 +0000 (16:57 +0200)
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: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Link: https://lore.kernel.org/r/20250407043019.4105613-6-koichiro.den@canonical.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-aggregator.c

index e5199de2e815e51d4ed43efdab95e6b8fcc647bc..e8c21ea9a5ea6ba96bd1c199418a410d7e48f760 100644 (file)
@@ -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) {