public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpiolib: introduce devm_fwnode_gpiod_get_index()

Browse source 
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>
This commit is contained in:
Dmitry Torokhov 2019-09-12 20:22:38 -07:00 • committed by Linus Walleij
parent 54ecb8f702
commit 2d2f116d69
2 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpio/gpiolib-devres.c
View file

@ -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); EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
/** /**
* devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a * devm_fwnode_gpiod_get_index - get a GPIO descriptor from a given node
* device's child node
* @dev: GPIO consumer * @dev: GPIO consumer
* @fwnode: firmware node containing GPIO reference
* @con_id: function within the GPIO consumer * @con_id: function within the GPIO consumer
* @index: index of the GPIO to obtain in the consumer * @index: index of the GPIO to obtain in the consumer
* @child: firmware node (child of @dev)
* @flags: GPIO initialization flags * @flags: GPIO initialization flags
* @label: label to attach to the requested GPIO * @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 * On successful request the GPIO pin is configured in accordance with
* provided @flags. * 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,
const char *con_id, int index, struct fwnode_handle *fwnode,
struct fwnode_handle *child, const char *con_id, int index,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label) const char *label)
{ {
char prop_name[32]; /* 32 is max size of property name */ char prop_name[32]; /* 32 is max size of property name */
struct gpio_desc **dr; 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", snprintf(prop_name, sizeof(prop_name), "%s",
gpio_suffixes[i]); gpio_suffixes[i]);
desc = fwnode_get_named_gpiod(child, prop_name, index, flags, desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
label); label);
if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
break; break;
@ -239,7 +238,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
return desc; 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() * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()

41
include/linux/gpio/consumer.h
View file

@ -176,11 +176,11 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, int index, const char *propname, int index,
enum gpiod_flags dflags, enum gpiod_flags dflags,
const char *label); const char *label);
struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
const char *con_id, int index, struct fwnode_handle *child,
struct fwnode_handle *child, const char *con_id, int index,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label); const char *label);
#else /* CONFIG_GPIOLIB */ #else /* CONFIG_GPIOLIB */
@ -531,6 +531,29 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
return ERR_PTR(-ENOSYS); 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 static inline
struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, int index, 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, enum gpiod_flags flags,
const char *label) 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 static inline
struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
const char *con_id, const char *con_id,
@ -550,8 +572,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label) 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, 0, flags, label);
flags, label);
} }
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO) #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)