Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / include / linux / gpio / consumer.h

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 5f72a49d1aa334d0be9f1f5cc131efcd16c5413e..7447d85dbe2f8f387d282c83e11da308895f7f14 100644 (file)
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GPIO_CONSUMER_H
 #define __LINUX_GPIO_CONSUMER_H
 
@@ -105,10 +106,15 @@ int gpiod_direction_output_raw(struct gpio_desc *desc, int value);
 
 /* Value get/set from non-sleeping context */
 int gpiod_get_value(const struct gpio_desc *desc);
+int gpiod_get_array_value(unsigned int array_size,
+                         struct gpio_desc **desc_array, int *value_array);
 void gpiod_set_value(struct gpio_desc *desc, int value);
 void gpiod_set_array_value(unsigned int array_size,
                           struct gpio_desc **desc_array, int *value_array);
 int gpiod_get_raw_value(const struct gpio_desc *desc);
+int gpiod_get_raw_array_value(unsigned int array_size,
+                             struct gpio_desc **desc_array,
+                             int *value_array);
 void gpiod_set_raw_value(struct gpio_desc *desc, int value);
 void gpiod_set_raw_array_value(unsigned int array_size,
                               struct gpio_desc **desc_array,
@@ -116,11 +122,17 @@ void gpiod_set_raw_array_value(unsigned int array_size,
 
 /* Value get/set from sleeping context */
 int gpiod_get_value_cansleep(const struct gpio_desc *desc);
+int gpiod_get_array_value_cansleep(unsigned int array_size,
+                                  struct gpio_desc **desc_array,
+                                  int *value_array);
 void gpiod_set_value_cansleep(struct gpio_desc *desc, int value);
 void gpiod_set_array_value_cansleep(unsigned int array_size,
                                    struct gpio_desc **desc_array,
                                    int *value_array);
 int gpiod_get_raw_value_cansleep(const struct gpio_desc *desc);
+int gpiod_get_raw_array_value_cansleep(unsigned int array_size,
+                                      struct gpio_desc **desc_array,
+                                      int *value_array);
 void gpiod_set_raw_value_cansleep(struct gpio_desc *desc, int value);
 void gpiod_set_raw_array_value_cansleep(unsigned int array_size,
                                        struct gpio_desc **desc_array,
@@ -311,6 +323,14 @@ static inline int gpiod_get_value(const struct gpio_desc *desc)
        WARN_ON(1);
        return 0;
 }
+static inline int gpiod_get_array_value(unsigned int array_size,
+                                       struct gpio_desc **desc_array,
+                                       int *value_array)
+{
+       /* GPIO can never have been requested */
+       WARN_ON(1);
+       return 0;
+}
 static inline void gpiod_set_value(struct gpio_desc *desc, int value)
 {
        /* GPIO can never have been requested */
@@ -329,6 +349,14 @@ static inline int gpiod_get_raw_value(const struct gpio_desc *desc)
        WARN_ON(1);
        return 0;
 }
+static inline int gpiod_get_raw_array_value(unsigned int array_size,
+                                           struct gpio_desc **desc_array,
+                                           int *value_array)
+{
+       /* GPIO can never have been requested */
+       WARN_ON(1);
+       return 0;
+}
 static inline void gpiod_set_raw_value(struct gpio_desc *desc, int value)
 {
        /* GPIO can never have been requested */
@@ -348,6 +376,14 @@ static inline int gpiod_get_value_cansleep(const struct gpio_desc *desc)
        WARN_ON(1);
        return 0;
 }
+static inline int gpiod_get_array_value_cansleep(unsigned int array_size,
+                                    struct gpio_desc **desc_array,
+                                    int *value_array)
+{
+       /* GPIO can never have been requested */
+       WARN_ON(1);
+       return 0;
+}
 static inline void gpiod_set_value_cansleep(struct gpio_desc *desc, int value)
 {
        /* GPIO can never have been requested */
@@ -366,6 +402,14 @@ static inline int gpiod_get_raw_value_cansleep(const struct gpio_desc *desc)
        WARN_ON(1);
        return 0;
 }
+static inline int gpiod_get_raw_array_value_cansleep(unsigned int array_size,
+                                              struct gpio_desc **desc_array,
+                                              int *value_array)
+{
+       /* GPIO can never have been requested */
+       WARN_ON(1);
+       return 0;
+}
 static inline void gpiod_set_raw_value_cansleep(struct gpio_desc *desc,
                                                int value)
 {