]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
gpiolib: make gpiochip_set_desc_names() return void
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 27 May 2024 19:46:13 +0000 (21:46 +0200)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 3 Jun 2024 14:04:38 +0000 (16:04 +0200)
gpiochip_set_desc_names() cannot fail so drop its return value.

Link: https://lore.kernel.org/r/20240527194613.197810-1-brgl@bgdev.pl
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpiolib.c

index 1a9aadd4c803c8189593a59100a76695d15a4407..ea723cf1c87fccb88ce877745f24ca4f6257e115 100644 (file)
@@ -486,7 +486,7 @@ static struct gpio_desc *gpio_name_to_desc(const char * const name)
  *   1. Non-unique names are still accepted,
  *   2. Name collisions within the same GPIO chip are not reported.
  */
-static int gpiochip_set_desc_names(struct gpio_chip *gc)
+static void gpiochip_set_desc_names(struct gpio_chip *gc)
 {
        struct gpio_device *gdev = gc->gpiodev;
        int i;
@@ -505,8 +505,6 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc)
        /* Then add all names to the GPIO descriptors */
        for (i = 0; i != gc->ngpio; ++i)
                gdev->descs[i].name = gc->names[i];
-
-       return 0;
 }
 
 /*
@@ -1000,11 +998,9 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
        INIT_LIST_HEAD(&gdev->pin_ranges);
 #endif
 
-       if (gc->names) {
-               ret = gpiochip_set_desc_names(gc);
-               if (ret)
-                       goto err_cleanup_desc_srcu;
-       }
+       if (gc->names)
+               gpiochip_set_desc_names(gc);
+
        ret = gpiochip_set_names(gc);
        if (ret)
                goto err_cleanup_desc_srcu;