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

Commit d34541bc authored by Olliver Schinagl's avatar Olliver Schinagl Committed by Linus Walleij
Browse files

gpio: Make the vararg hacks not pass magic values 



Right now, in consumer.h, there's some vararg hacks that pass 0 as the
flags. What actually is passed however is GPIOD_ASIS, which naturally is
also 0. Using the define/enum rather then the magic 0 makes it the
define more readable to a passer by.

Signed-off-by: default avatarOlliver Schinagl <oliver@schinagl.nl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ffe4770b

include/linux/gpio/consumer.h

+9 −8
Original line number Diff line number Diff line
@@ -340,31 +340,32 @@ static inline int desc_to_gpio(const struct gpio_desc *desc) 
 * etc.

 */

#define __gpiod_get(dev, con_id, flags, ...) __gpiod_get(dev, con_id, flags)

#define gpiod_get(varargs...) __gpiod_get(varargs, 0)

#define gpiod_get(varargs...) __gpiod_get(varargs, GPIOD_ASIS)

#define __gpiod_get_index(dev, con_id, index, flags, ...)		\

	__gpiod_get_index(dev, con_id, index, flags)

#define gpiod_get_index(varargs...) __gpiod_get_index(varargs, 0)

#define gpiod_get_index(varargs...) __gpiod_get_index(varargs, GPIOD_ASIS)

#define __gpiod_get_optional(dev, con_id, flags, ...)			\

	__gpiod_get_optional(dev, con_id, flags)

#define gpiod_get_optional(varargs...) __gpiod_get_optional(varargs, 0)

#define gpiod_get_optional(varargs...) __gpiod_get_optional(varargs, GPIOD_ASIS)

#define __gpiod_get_index_optional(dev, con_id, index, flags, ...)	\

	__gpiod_get_index_optional(dev, con_id, index, flags)

#define gpiod_get_index_optional(varargs...)				\

	__gpiod_get_index_optional(varargs, 0)

	__gpiod_get_index_optional(varargs, GPIOD_ASIS)

#define __devm_gpiod_get(dev, con_id, flags, ...)			\

	__devm_gpiod_get(dev, con_id, flags)

#define devm_gpiod_get(varargs...) __devm_gpiod_get(varargs, 0)

#define devm_gpiod_get(varargs...) __devm_gpiod_get(varargs, GPIOD_ASIS)

#define __devm_gpiod_get_index(dev, con_id, index, flags, ...)		\

	__devm_gpiod_get_index(dev, con_id, index, flags)

#define devm_gpiod_get_index(varargs...) __devm_gpiod_get_index(varargs, 0)

#define devm_gpiod_get_index(varargs...)				\

	__devm_gpiod_get_index(varargs, GPIOD_ASIS)

#define __devm_gpiod_get_optional(dev, con_id, flags, ...)		\

	__devm_gpiod_get_optional(dev, con_id, flags)

#define devm_gpiod_get_optional(varargs...)				\

	__devm_gpiod_get_optional(varargs, 0)

	__devm_gpiod_get_optional(varargs, GPIOD_ASIS)

#define __devm_gpiod_get_index_optional(dev, con_id, index, flags, ...)	\

	__devm_gpiod_get_index_optional(dev, con_id, index, flags)

#define devm_gpiod_get_index_optional(varargs...)			\

	__devm_gpiod_get_index_optional(varargs, 0)

	__devm_gpiod_get_index_optional(varargs, GPIOD_ASIS)



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)