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>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 0147c900afea1145662d21d9b1831f6375998351..0ca33397812c51de597dbe7b4d1a9d495d26d81d 100644 (file)
--- 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);
@@ -2359,33 +2359,6 @@ void gpiod_free(struct gpio_desc *desc)
        gpio_device_put(desc->gdev);
 }
 
-/**
- * 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.
@@ -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);
 

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index cae4cdaa87db3bd03637818e07ef77665d7cd12f..d1a3cb061927f3c9d7e21129195ad2bdc7ae30d7 100644 (file)
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -531,7 +531,6 @@ struct gpio_chip {
 #endif /* CONFIG_OF_GPIO */
 };
 
-const char *gpiochip_is_requested(struct gpio_chip *gc, unsigned int offset);
 char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset);