Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf9af0d5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Walleij
Browse files

gpio: Propagate errors from gpiod_set_array_value_complex() 



Internal helper function gpiod_set_array_value_complex() was changed to
return an error value, but not all gpiolib callers were updated to
propagate the new error up.

Fixes: 3027743f ("gpio: Remove VLA from gpiolib")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c2937668

Documentation/driver-api/gpio/consumer.rst

+8 −8
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ The following functions get or set the values of an array of GPIOs:: 
					   struct gpio_array *array_info,

					   unsigned long *value_bitmap);



	void gpiod_set_array_value(unsigned int array_size,

	int gpiod_set_array_value(unsigned int array_size,

				  struct gpio_desc **desc_array,

				  struct gpio_array *array_info,

				  unsigned long *value_bitmap)
@@ -348,7 +348,7 @@ The following functions get or set the values of an array of GPIOs:: 
				      struct gpio_desc **desc_array,

				      struct gpio_array *array_info,

				      unsigned long *value_bitmap)

	void gpiod_set_array_value_cansleep(unsigned int array_size,

	int gpiod_set_array_value_cansleep(unsigned int array_size,

					   struct gpio_desc **desc_array,

					   struct gpio_array *array_info,

					   unsigned long *value_bitmap)

drivers/gpio/gpiolib.c

+16 −14
Original line number Diff line number Diff line
@@ -3346,15 +3346,16 @@ EXPORT_SYMBOL_GPL(gpiod_set_raw_array_value); 
 * This function should be called from contexts where we cannot sleep, and will

 * complain if the GPIO chip functions potentially sleep.

 */

void gpiod_set_array_value(unsigned int array_size,

int gpiod_set_array_value(unsigned int array_size,

			  struct gpio_desc **desc_array,

			  struct gpio_array *array_info,

			  unsigned long *value_bitmap)

{

	if (!desc_array)

		return;

	gpiod_set_array_value_complex(false, false, array_size, desc_array,

				      array_info, value_bitmap);

		return -EINVAL;

	return gpiod_set_array_value_complex(false, false, array_size,

					     desc_array, array_info,

					     value_bitmap);

}

EXPORT_SYMBOL_GPL(gpiod_set_array_value);
@@ -3763,16 +3764,17 @@ void gpiod_add_lookup_tables(struct gpiod_lookup_table **tables, size_t n) 
 *

 * This function is to be called from contexts that can sleep.

 */

void gpiod_set_array_value_cansleep(unsigned int array_size,

int gpiod_set_array_value_cansleep(unsigned int array_size,

				   struct gpio_desc **desc_array,

				   struct gpio_array *array_info,

				   unsigned long *value_bitmap)

{

	might_sleep_if(extra_checks);

	if (!desc_array)

		return;

	gpiod_set_array_value_complex(false, true, array_size, desc_array,

				      array_info, value_bitmap);

		return -EINVAL;

	return gpiod_set_array_value_complex(false, true, array_size,

					     desc_array, array_info,

					     value_bitmap);

}

EXPORT_SYMBOL_GPL(gpiod_set_array_value_cansleep);

include/linux/gpio/consumer.h

+15 −13
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int gpiod_get_array_value(unsigned int array_size, 
			  struct gpio_array *array_info,

			  unsigned long *value_bitmap);

void gpiod_set_value(struct gpio_desc *desc, int value);

void gpiod_set_array_value(unsigned int array_size,

int gpiod_set_array_value(unsigned int array_size,

			  struct gpio_desc **desc_array,

			  struct gpio_array *array_info,

			  unsigned long *value_bitmap);
@@ -139,7 +139,7 @@ int gpiod_get_array_value_cansleep(unsigned int array_size, 
				   struct gpio_array *array_info,

				   unsigned long *value_bitmap);

void gpiod_set_value_cansleep(struct gpio_desc *desc, int value);

void gpiod_set_array_value_cansleep(unsigned int array_size,

int gpiod_set_array_value_cansleep(unsigned int array_size,

				   struct gpio_desc **desc_array,

				   struct gpio_array *array_info,

				   unsigned long *value_bitmap);
@@ -361,13 +361,14 @@ static inline void gpiod_set_value(struct gpio_desc *desc, int value) 
	/* GPIO can never have been requested */

	WARN_ON(1);

}

static inline void gpiod_set_array_value(unsigned int array_size,

static inline int gpiod_set_array_value(unsigned int array_size,

					struct gpio_desc **desc_array,

					struct gpio_array *array_info,

					unsigned long *value_bitmap)

{

	/* GPIO can never have been requested */

	WARN_ON(1);

	return 0;

}

static inline int gpiod_get_raw_value(const struct gpio_desc *desc)

{
@@ -419,13 +420,14 @@ static inline void gpiod_set_value_cansleep(struct gpio_desc *desc, int value) 
	/* GPIO can never have been requested */

	WARN_ON(1);

}

static inline void gpiod_set_array_value_cansleep(unsigned int array_size,

static inline int gpiod_set_array_value_cansleep(unsigned int array_size,

					    struct gpio_desc **desc_array,

					    struct gpio_array *array_info,

					    unsigned long *value_bitmap)

{

	/* GPIO can never have been requested */

	WARN_ON(1);

	return 0;

}

static inline int gpiod_get_raw_value_cansleep(const struct gpio_desc *desc)

{