| Message ID | 20201009184359.16427-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] gpiolib: Use proper type for bias enumerator in gpio_set_bias() | expand |
On Fri, Oct 9, 2020 at 8:44 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > First of all, bias has a special type as being a part of enum pin_config_param. > Second, 0 is also defined bias which is equivalent to BUS_HOLD. > > Taking into account above, change type of bias variable and refactor > gpio_set_bias() in a way that it doesn't use BUS_HOLD as a place holder. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Patch applied. Yours, Linus Walleij
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 33871ad6fed8..4df1f1a23a8b 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2256,8 +2256,8 @@ static int gpio_set_config(struct gpio_desc *desc, enum pin_config_param mode) static int gpio_set_bias(struct gpio_desc *desc) { - int bias = 0; - int ret = 0; + enum pin_config_param bias; + int ret; if (test_bit(FLAG_BIAS_DISABLE, &desc->flags)) bias = PIN_CONFIG_BIAS_DISABLE; @@ -2265,12 +2265,13 @@ static int gpio_set_bias(struct gpio_desc *desc) bias = PIN_CONFIG_BIAS_PULL_UP; else if (test_bit(FLAG_PULL_DOWN, &desc->flags)) bias = PIN_CONFIG_BIAS_PULL_DOWN; + else + return 0; + + ret = gpio_set_config(desc, bias); + if (ret != -ENOTSUPP) + return ret; - if (bias) { - ret = gpio_set_config(desc, bias); - if (ret != -ENOTSUPP) - return ret; - } return 0; }
First of all, bias has a special type as being a part of enum pin_config_param. Second, 0 is also defined bias which is equivalent to BUS_HOLD. Taking into account above, change type of bias variable and refactor gpio_set_bias() in a way that it doesn't use BUS_HOLD as a place holder. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpiolib.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)