aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/gpio.h2
-rw-r--r--include/linux/gpio/consumer.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a5f56a0213a7..23e364538ab5 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -69,7 +69,7 @@ static inline int gpio_direction_input(unsigned gpio)
69} 69}
70static inline int gpio_direction_output(unsigned gpio, int value) 70static inline int gpio_direction_output(unsigned gpio, int value)
71{ 71{
72 return gpiod_direction_output(gpio_to_desc(gpio), value); 72 return gpiod_direction_output_raw(gpio_to_desc(gpio), value);
73} 73}
74 74
75static inline int gpio_set_debounce(unsigned gpio, unsigned debounce) 75static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 4d34dbbbad4d..387994325122 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -36,6 +36,7 @@ void devm_gpiod_put(struct device *dev, struct gpio_desc *desc);
36int gpiod_get_direction(const struct gpio_desc *desc); 36int gpiod_get_direction(const struct gpio_desc *desc);
37int gpiod_direction_input(struct gpio_desc *desc); 37int gpiod_direction_input(struct gpio_desc *desc);
38int gpiod_direction_output(struct gpio_desc *desc, int value); 38int gpiod_direction_output(struct gpio_desc *desc, int value);
39int gpiod_direction_output_raw(struct gpio_desc *desc, int value);
39 40
40/* Value get/set from non-sleeping context */ 41/* Value get/set from non-sleeping context */
41int gpiod_get_value(const struct gpio_desc *desc); 42int gpiod_get_value(const struct gpio_desc *desc);
@@ -121,6 +122,12 @@ static inline int gpiod_direction_output(struct gpio_desc *desc, int value)
121 WARN_ON(1); 122 WARN_ON(1);
122 return -ENOSYS; 123 return -ENOSYS;
123} 124}
125static inline int gpiod_direction_output_raw(struct gpio_desc *desc, int value)
126{
127 /* GPIO can never have been requested */
128 WARN_ON(1);
129 return -ENOSYS;
130}
124 131
125 132
126static inline int gpiod_get_value(const struct gpio_desc *desc) 133static inline int gpiod_get_value(const struct gpio_desc *desc)