Commit ea95bd85 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpiolib: make gpiochip_set_desc_names() return void 

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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 3a409859

drivers/gpio/gpiolib.c

+4 −8
Original line number Diff line number Diff line
@@ -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;