Commit b04ce10d authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

pinctrl: stm32: drop wrappers around pinctrl_gpio_free/input() 



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

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 895bf1d8

drivers/pinctrl/stm32/pinctrl-stm32.c

+3 −13
Original line number Diff line number Diff line
@@ -220,11 +220,6 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset) 
	return pinctrl_gpio_request(chip, offset);

}



static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset)

{

	pinctrl_gpio_free(chip, offset);

}



static int stm32_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	struct stm32_gpio_bank *bank = gpiochip_get_data(chip);
@@ -239,11 +234,6 @@ static void stm32_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
	__stm32_gpio_set(bank, offset, value);

}



static int stm32_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

{

	return pinctrl_gpio_direction_input(chip, offset);

}



static int stm32_gpio_direction_output(struct gpio_chip *chip,

	unsigned offset, int value)

{
@@ -316,10 +306,10 @@ static int stm32_gpio_init_valid_mask(struct gpio_chip *chip, 


static const struct gpio_chip stm32_gpio_template = {

	.request		= stm32_gpio_request,

	.free			= stm32_gpio_free,

	.free			= pinctrl_gpio_free,

	.get			= stm32_gpio_get,

	.set			= stm32_gpio_set,

	.direction_input	= stm32_gpio_direction_input,

	.direction_input	= pinctrl_gpio_direction_input,

	.direction_output	= stm32_gpio_direction_output,

	.to_irq			= stm32_gpio_to_irq,

	.get_direction		= stm32_gpio_get_direction,
@@ -381,7 +371,7 @@ static int stm32_gpio_irq_request_resources(struct irq_data *irq_data) 
	struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);

	int ret;



	ret = stm32_gpio_direction_input(&bank->gpio_chip, irq_data->hwirq);

	ret = pinctrl_gpio_direction_input(&bank->gpio_chip, irq_data->hwirq);

	if (ret)

		return ret;