Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab5bd035 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Linus Walleij
Browse files

pinctrl-sx150x: Improve oscio GPIO functions 



Move actual code that configures oscio pin into a separate function and
use it instead of calling sx150x_gpio_set to avoid calling
sx150x_pin_is_oscio twice and correctly propagte error code in
sx150x_gpio_direction_output.

Tested-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d977a876

drivers/pinctrl/pinctrl-sx150x.c

+11 −7
Original line number Diff line number Diff line
@@ -372,15 +372,21 @@ static int __sx150x_gpio_set(struct sx150x_pinctrl *pctl, unsigned int offset, 
				 BIT(offset), value ? BIT(offset) : 0);

}



static int sx150x_gpio_oscio_set(struct sx150x_pinctrl *pctl,

				 int value)

{

	return regmap_write(pctl->regmap,

			    pctl->data->pri.x789.reg_clock,

			    (value ? 0x1f : 0x10));

}



static void sx150x_gpio_set(struct gpio_chip *chip, unsigned int offset,

			       int value)

{

	struct sx150x_pinctrl *pctl = gpiochip_get_data(chip);



	if (sx150x_pin_is_oscio(pctl, offset))

		regmap_write(pctl->regmap,

			     pctl->data->pri.x789.reg_clock,

			     (value ? 0x1f : 0x10));

		sx150x_gpio_oscio_set(pctl, value);

	else

		__sx150x_gpio_set(pctl, offset, value);
@@ -405,10 +411,8 @@ static int sx150x_gpio_direction_output(struct gpio_chip *chip, 
	struct sx150x_pinctrl *pctl = gpiochip_get_data(chip);

	int ret;



	if (sx150x_pin_is_oscio(pctl, offset)) {

		sx150x_gpio_set(chip, offset, value);

		return 0;

	}

	if (sx150x_pin_is_oscio(pctl, offset))

		return sx150x_gpio_oscio_set(pctl, value);



	ret = __sx150x_gpio_set(pctl, offset, value);

	if (ret < 0)