Commit 8df89a7c authored by Hans Verkuil's avatar Hans Verkuil Committed by Linus Walleij
Browse files

pinctrl-sunxi: don't call pinctrl_gpio_direction() 



Set the direction directly without calling pinctrl_gpio_direction().
This avoids the mutex_lock() calls in that function, which would
invalid the can_sleep = false.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://lore.kernel.org/r/20211206131648.1521868-4-hverkuil-cisco@xs4all.nl


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1a4541b6

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+6 −2
Original line number Diff line number Diff line
@@ -835,7 +835,9 @@ static const struct pinmux_ops sunxi_pmx_ops = { 
static int sunxi_pinctrl_gpio_direction_input(struct gpio_chip *chip,

					unsigned offset)

{

	return pinctrl_gpio_direction_input(chip->base + offset);

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);



	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL, offset, true);

}



static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -885,8 +887,10 @@ static void sunxi_pinctrl_gpio_set(struct gpio_chip *chip, 
static int sunxi_pinctrl_gpio_direction_output(struct gpio_chip *chip,

					unsigned offset, int value)

{

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);



	sunxi_pinctrl_gpio_set(chip, offset, value);

	return pinctrl_gpio_direction_output(chip->base + offset);

	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL, offset, false);

}



static int sunxi_pinctrl_gpio_of_xlate(struct gpio_chip *gc,