gpio: pca953x: Fix pca953x_gpio_set_pull_up_down()

A previous fix, commit dc87f6dd058a ("gpio: pca953x: Fix
pca953x_gpio_set_config"), identified that pinconf_to_config_param() needed
to be used to isolate the config_param from the pinconf in
pca953x_gpio_set_config(). This fix however did not consider that this
would also be needed in pca953x_gpio_set_pull_up_down() to which it passes
this config.

Perform a similar call in pca953x_gpio_set_pull_up_down() to isolate the
configuration parameter there as well, rather than passing it from
pca953x_gpio_set_config() as the configuration argument may also be needed
in pca953x_gpio_set_pull_up_down() at a later date.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 00c1e2f..a6081d9 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -549,6 +549,8 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
                                         unsigned int offset,
                                         unsigned long config)
 {
+       enum pin_config_param param = pinconf_to_config_param(config);
+
        u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset);
        u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset);
        u8 bit = BIT(offset % BANK_SZ);
@@ -564,9 +566,9 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
        mutex_lock(&chip->i2c_lock);
 
        /* Configure pull-up/pull-down */
-       if (config == PIN_CONFIG_BIAS_PULL_UP)
+       if (param == PIN_CONFIG_BIAS_PULL_UP)
                ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, bit);
-       else if (config == PIN_CONFIG_BIAS_PULL_DOWN)
+       else if (param == PIN_CONFIG_BIAS_PULL_DOWN)
                ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, 0);
        else
                ret = 0;
@@ -574,7 +576,7 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
                goto exit;
 
        /* Disable/Enable pull-up/pull-down */
-       if (config == PIN_CONFIG_BIAS_DISABLE)
+       if (param == PIN_CONFIG_BIAS_DISABLE)
                ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, 0);
        else
                ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, bit);