gpiolib: introduce devm_fwnode_gpiod_get_index()

devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
in question does not have to be a child of device node. Let's rename it
to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
for now.

Also let's add a devm_fwnode_gpiod_get() wrapper as majority of the
callers need a single GPIO.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20190913032240.50333-2-dmitry.torokhov@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c
index 98e3c20d9730e66ad46bff8317e96fb4996eda32..9a0475c87f959eb26c47026537a68c28c05d673b 100644 (file)
--- a/drivers/gpio/gpiolib-devres.c
+++ b/drivers/gpio/gpiolib-devres.c
@@ -185,12 +185,11 @@ struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,
 EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
 
 /**
- * devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a
- *                                         device's child node
+ * devm_fwnode_gpiod_get_index - get a GPIO descriptor from a given node
  * @dev:       GPIO consumer
+ * @fwnode:    firmware node containing GPIO reference
  * @con_id:    function within the GPIO consumer
  * @index:     index of the GPIO to obtain in the consumer
- * @child:     firmware node (child of @dev)
  * @flags:     GPIO initialization flags
  * @label:     label to attach to the requested GPIO
  *
@@ -200,11 +199,11 @@ EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
  * On successful request the GPIO pin is configured in accordance with
  * provided @flags.
  */
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
-                                               const char *con_id, int index,
-                                               struct fwnode_handle *child,
-                                               enum gpiod_flags flags,
-                                               const char *label)
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+                                             struct fwnode_handle *fwnode,
+                                             const char *con_id, int index,
+                                             enum gpiod_flags flags,
+                                             const char *label)
 {
        char prop_name[32]; /* 32 is max size of property name */
        struct gpio_desc **dr;
@@ -224,7 +223,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
                        snprintf(prop_name, sizeof(prop_name), "%s",
                                            gpio_suffixes[i]);
 
-               desc = fwnode_get_named_gpiod(child, prop_name, index, flags,
+               desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
                                              label);
                if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
                        break;
@@ -239,7 +238,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
 
        return desc;
 }
-EXPORT_SYMBOL_GPL(devm_fwnode_get_index_gpiod_from_child);
+EXPORT_SYMBOL_GPL(devm_fwnode_gpiod_get_index);
 
 /**
  * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index b70af921c6145527322bd00cb97fa5749d4a335a..dc0ddcd30515b097d121bb5b0910586d1dc6043a 100644 (file)
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -176,11 +176,11 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
                                         const char *propname, int index,
                                         enum gpiod_flags dflags,
                                         const char *label);
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
-                                               const char *con_id, int index,
-                                               struct fwnode_handle *child,
-                                               enum gpiod_flags flags,
-                                               const char *label);
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+                                             struct fwnode_handle *child,
+                                             const char *con_id, int index,
+                                             enum gpiod_flags flags,
+                                             const char *label);
 
 #else /* CONFIG_GPIOLIB */
 
@@ -531,6 +531,29 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
        return ERR_PTR(-ENOSYS);
 }
 
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+                                             struct fwnode_handle *fwnode,
+                                             const char *con_id, int index,
+                                             enum gpiod_flags flags,
+                                             const char *label)
+{
+       return ERR_PTR(-ENOSYS);
+}
+
+#endif /* CONFIG_GPIOLIB */
+
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get(struct device *dev,
+                                       struct fwnode_handle *fwnode,
+                                       const char *con_id,
+                                       enum gpiod_flags flags,
+                                       const char *label)
+{
+       return devm_fwnode_gpiod_get_index(dev, fwnode, con_id, 0,
+                                          flags, label);
+}
+
 static inline
 struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
                                                const char *con_id, int index,
@@ -538,11 +561,10 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
                                                enum gpiod_flags flags,
                                                const char *label)
 {
-       return ERR_PTR(-ENOSYS);
+       return devm_fwnode_gpiod_get_index(dev, child, con_id, index,
+                                          flags, label);
 }
 
-#endif /* CONFIG_GPIOLIB */
-
 static inline
 struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
                                                   const char *con_id,
@@ -550,8 +572,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
                                                   enum gpiod_flags flags,
                                                   const char *label)
 {
-       return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,
-                                                     flags, label);
+       return devm_fwnode_gpiod_get_index(dev, child, con_id, 0, flags, label);
 }
 
 #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)