pinctrl: remove pinctrl_gpio_free()

There are no more users of pinctrl_gpio_free() so remove it.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index bee26db31ee9729ea20b30070ac710777669adf4..c00d7db2d6f108abcdc99b2c65aed894e500cbac 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -819,29 +819,6 @@ int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset)
 }
 EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new);
 
-/* This function is deprecated and will be removed. Don't use. */
-void pinctrl_gpio_free(unsigned gpio)
-{
-       struct pinctrl_dev *pctldev;
-       struct pinctrl_gpio_range *range;
-       int ret;
-       int pin;
-
-       ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
-       if (ret) {
-               return;
-       }
-       mutex_lock(&pctldev->mutex);
-
-       /* Convert to the pin controllers number space */
-       pin = gpio_to_pin(range, gpio);
-
-       pinmux_free_gpio(pctldev, pin, range);
-
-       mutex_unlock(&pctldev->mutex);
-}
-EXPORT_SYMBOL_GPL(pinctrl_gpio_free);
-
 /**
  * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO
  * @gc: GPIO chip structure from the GPIO subsystem
@@ -853,7 +830,23 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_free);
  */
 void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)
 {
-       return pinctrl_gpio_free(gc->base + offset);
+       struct pinctrl_gpio_range *range;
+       struct pinctrl_dev *pctldev;
+       int ret, pin;
+
+       ret = pinctrl_get_device_gpio_range(gc->base + offset, &pctldev,
+                                           &range);
+       if (ret)
+               return;
+
+       mutex_lock(&pctldev->mutex);
+
+       /* Convert to the pin controllers number space */
+       pin = gpio_to_pin(range, gc->base + offset);
+
+       pinmux_free_gpio(pctldev, pin, range);
+
+       mutex_unlock(&pctldev->mutex);
 }
 EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new);
 

diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 83a414a347cf6260155090c8e9ab198ec2b1a0ec..90b2f0b78c4be63ec1dbdbbfb86ea58f3ab157d8 100644 (file)
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -28,7 +28,6 @@ struct pinctrl_state;
 /* External interface to pin control */
 bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset);
 int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset);
-void pinctrl_gpio_free(unsigned gpio);
 void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset);
 int pinctrl_gpio_direction_input(unsigned gpio);
 int pinctrl_gpio_direction_input_new(struct gpio_chip *gc,
@@ -83,10 +82,6 @@ pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset)
        return 0;
 }
 
-static inline void pinctrl_gpio_free(unsigned gpio)
-{
-}
-
 static inline void
 pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)
 {