Commit 68e3b071 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski

Merge branch 'gpio/device_get_label_for_pinctrl' into gpio/for-next

Pull in the immutable branch between GPIO and pinctrl adding a new
getter allowing to retrieve the label of a GPIO device.
parents d652049e d1f77282
......@@ -254,6 +254,20 @@ int gpio_device_get_base(struct gpio_device *gdev)
}
EXPORT_SYMBOL_GPL(gpio_device_get_base);
/**
* gpio_device_get_label() - Get the label of this GPIO device
* @gdev: GPIO device
*
* Returns:
* Pointer to the string containing the GPIO device label. The string's
* lifetime is tied to that of the underlying GPIO device.
*/
const char *gpio_device_get_label(struct gpio_device *gdev)
{
return gdev->label;
}
EXPORT_SYMBOL(gpio_device_get_label);
/**
* gpio_device_get_chip() - Get the gpio_chip implementation of this GPIO device
* @gdev: GPIO device
......
......@@ -786,6 +786,7 @@ struct gpio_device *gpiod_to_gpio_device(struct gpio_desc *desc);
/* struct gpio_device getters */
int gpio_device_get_base(struct gpio_device *gdev);
const char *gpio_device_get_label(struct gpio_device *gdev);
#else /* CONFIG_GPIOLIB */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment