aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Golaszewski <[email protected]>2023-11-24 20:30:00 +0100
committerBartosz Golaszewski <[email protected]>2023-11-24 20:30:00 +0100
commit68e3b071b88d2712b3d8b6bfcfbcd0635653d5a5 (patch)
tree92976c72b346ef4db142c3cb92d4ea3d8a2e37d0
parentd652049e118ffe9227155f7b9b85faf15fc91f8f (diff)
parentd1f7728259ef02ac20b7afb6e7eb5a9eb1696c25 (diff)
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.
-rw-r--r--drivers/gpio/gpiolib.c14
-rw-r--r--include/linux/gpio/driver.h1
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 95d2a7b2ea3e..a5faaea6915d 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -255,6 +255,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
*
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 0aed62f0c633..100c329dc986 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -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 */