pinctrl: starfive: jh7100: drop wrappers around pinctrl_gpio_request/free()

pinctrl_gpio_*() helpers now have signatures corresponding with those of
the GPIOLIB callbacks. We can drop the wrappers.

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

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
index 7beed57d665a6bc046b8e09c12c323ab1b562138..ea70b8c61679f0134e99350a3e3d7f812ac33e3c 100644 (file)
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
@@ -916,16 +916,6 @@ static struct pinctrl_desc starfive_desc = {
        .custom_conf_items = starfive_pinconf_custom_conf_items,
 };
 
-static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio)
-{
-       return pinctrl_gpio_request(gc, gpio);
-}
-
-static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio)
-{
-       pinctrl_gpio_free(gc, gpio);
-}
-
 static int starfive_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio)
 {
        struct starfive_pinctrl *sfp = container_of(gc, struct starfive_pinctrl, gc);
@@ -1309,8 +1299,8 @@ static int starfive_probe(struct platform_device *pdev)
 
        sfp->gc.label = dev_name(dev);
        sfp->gc.owner = THIS_MODULE;
-       sfp->gc.request = starfive_gpio_request;
-       sfp->gc.free = starfive_gpio_free;
+       sfp->gc.request = pinctrl_gpio_request;
+       sfp->gc.free = pinctrl_gpio_free;
        sfp->gc.get_direction = starfive_gpio_get_direction;
        sfp->gc.direction_input = starfive_gpio_direction_input;
        sfp->gc.direction_output = starfive_gpio_direction_output;