Commit 2d2f116d authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Linus Walleij
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20190913032240.50333-2-dmitry.torokhov@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 54ecb8f7

drivers/gpio/gpiolib-devres.c

+9 −10
Original line number Diff line number Diff line
@@ -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,9 +199,9 @@ 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,

struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,

					      struct fwnode_handle *fwnode,

					      const char *con_id, int index,

						struct fwnode_handle *child,

					      enum gpiod_flags flags,

					      const char *label)

{
@@ -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()

include/linux/gpio/consumer.h

+31 −10
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ 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 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);
@@ -532,9 +532,9 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
}



static inline

struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,

struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,

					      struct fwnode_handle *fwnode,

					      const char *con_id, int index,

						struct fwnode_handle *child,

					      enum gpiod_flags flags,

					      const char *label)

{
@@ -544,16 +544,37 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev, 
#endif /* CONFIG_GPIOLIB */



static inline

struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,

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,

						struct fwnode_handle *child,

						enum gpiod_flags flags,

						const char *label)

{

	return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,

	return devm_fwnode_gpiod_get_index(dev, child, con_id, index,

					   flags, label);

}



static inline

struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,

						   const char *con_id,

						   struct fwnode_handle *child,

						   enum gpiod_flags flags,

						   const char *label)

{

	return devm_fwnode_gpiod_get_index(dev, child, con_id, 0, flags, label);

}



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)

struct device_node;

CRA Git | Maintained and supported by SUSTech CRA and CCSE