summaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>2023-12-04 12:35:09 +0300
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>2023-12-08 11:26:43 +0300
commitf8d05e276b45e3097dfddd628fa991ce69c05c99 (patch)
tree77c73ef9e605122adc9ea9bcbc5738bb265e859e /drivers/gpio
parent6fd9c9933475a3efd7eed2f80c7778908a560a1f (diff)
downloadlinux-f8d05e276b45e3097dfddd628fa991ce69c05c99.tar.xz
gpiolib: remove gpiochip_is_requested()
We have no external users of gpiochip_is_requested(). Let's remove it and replace its internal calls with direct testing of the REQUESTED flag. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpiolib.c48
1 files changed, 13 insertions, 35 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 0147c900afea..0ca33397812c 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1071,7 +1071,7 @@ void gpiochip_remove(struct gpio_chip *gc)
spin_lock_irqsave(&gpio_lock, flags);
for (i = 0; i < gdev->ngpio; i++) {
- if (gpiochip_is_requested(gc, i))
+ if (test_bit(FLAG_REQUESTED, &gdev->descs[i].flags))
break;
}
spin_unlock_irqrestore(&gpio_lock, flags);
@@ -2360,33 +2360,6 @@ void gpiod_free(struct gpio_desc *desc)
}
/**
- * gpiochip_is_requested - return string iff signal was requested
- * @gc: controller managing the signal
- * @offset: of signal within controller's 0..(ngpio - 1) range
- *
- * Returns NULL if the GPIO is not currently requested, else a string.
- * The string returned is the label passed to gpio_request(); if none has been
- * passed it is a meaningless, non-NULL constant.
- *
- * This function is for use by GPIO controller drivers. The label can
- * help with diagnostics, and knowing that the signal is used as a GPIO
- * can help avoid accidentally multiplexing it to another controller.
- */
-const char *gpiochip_is_requested(struct gpio_chip *gc, unsigned int offset)
-{
- struct gpio_desc *desc;
-
- desc = gpiochip_get_desc(gc, offset);
- if (IS_ERR(desc))
- return NULL;
-
- if (test_bit(FLAG_REQUESTED, &desc->flags) == 0)
- return NULL;
- return desc->label;
-}
-EXPORT_SYMBOL_GPL(gpiochip_is_requested);
-
-/**
* gpiochip_dup_line_label - Get a copy of the consumer label.
* @gc: GPIO chip controlling this line.
* @offset: Hardware offset of the line.
@@ -2400,18 +2373,23 @@ EXPORT_SYMBOL_GPL(gpiochip_is_requested);
*/
char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset)
{
- const char *label;
- char *copy;
+ struct gpio_desc *desc;
+ char *label;
- label = gpiochip_is_requested(gc, offset);
- if (!label)
+ desc = gpiochip_get_desc(gc, offset);
+ if (IS_ERR(desc))
return NULL;
- copy = kstrdup(label, GFP_KERNEL);
- if (!copy)
+ guard(spinlock_irqsave)(&gpio_lock);
+
+ if (!test_bit(FLAG_REQUESTED, &desc->flags))
+ return NULL;
+
+ label = kstrdup(desc->label, GFP_KERNEL);
+ if (!label)
return ERR_PTR(-ENOMEM);
- return copy;
+ return label;
}
EXPORT_SYMBOL_GPL(gpiochip_dup_line_label);