diff options
| author |   Andrey Smirnov <andrew.smirnov@gmail.com> | 2016-11-07 08:53:19 -0800 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2016-11-08 09:45:20 +0100 |
| commit | ab5bd035445932397bfe351403ce52246096a261 (patch) | |
| tree | cbc9a72de7400ebd8b945cf207025d3ba7b3f364 /drivers/pinctrl/pinctrl-sx150x.c | |
| parent | pinctrl-sx150x: Remove excessive locking (diff) | |
| download | linux-dev-ab5bd035445932397bfe351403ce52246096a261.tar.xz linux-dev-ab5bd035445932397bfe351403ce52246096a261.zip | |
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: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-sx150x.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-sx150x.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c index c339800a396b..f2ec072a2134 100644 --- a/drivers/pinctrl/pinctrl-sx150x.c +++ b/drivers/pinctrl/pinctrl-sx150x.c @@ -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) |