| Message ID | ace08e630ab57d08817c5e8669094c10a7c667ad.1495119548.git.jan.kiszka@siemens.com |
|---|---|
| State | New |
| Headers | show |
On Thu, May 18, 2017 at 5:59 PM, Jan Kiszka <jan.kiszka@siemens.com> wrote: > First, the logic for translating a register bit to the return code of > exar_get_direction and exar_get_value were wrong. And second, there was > a flip regarding the register bank in exar_get_direction. > FWIW: Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > drivers/gpio/gpio-exar.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c > index 4ed1f8bdeda7..d8b6296c11de 100644 > --- a/drivers/gpio/gpio-exar.c > +++ b/drivers/gpio/gpio-exar.c > @@ -69,7 +69,7 @@ static int exar_get(struct gpio_chip *chip, unsigned int reg) > value = readb(exar_gpio->regs + reg); > mutex_unlock(&exar_gpio->lock); > > - return !!value; > + return value; > } > > static int exar_get_direction(struct gpio_chip *chip, unsigned int offset) > @@ -79,7 +79,7 @@ static int exar_get_direction(struct gpio_chip *chip, unsigned int offset) > int val; > > addr = bank ? EXAR_OFFSET_MPIOSEL_HI : EXAR_OFFSET_MPIOSEL_LO; > - val = exar_get(chip, addr) >> (offset % 8); > + val = exar_get(chip, addr) & BIT(offset % 8); > > return !!val; > } > @@ -90,8 +90,8 @@ static int exar_get_value(struct gpio_chip *chip, unsigned int offset) > unsigned int addr; > int val; > > - addr = bank ? EXAR_OFFSET_MPIOLVL_LO : EXAR_OFFSET_MPIOLVL_HI; > - val = exar_get(chip, addr) >> (offset % 8); > + addr = bank ? EXAR_OFFSET_MPIOLVL_HI : EXAR_OFFSET_MPIOLVL_LO; > + val = exar_get(chip, addr) & BIT(offset % 8); > > return !!val; > } > -- > 2.12.0 >
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c index 4ed1f8bdeda7..d8b6296c11de 100644 --- a/drivers/gpio/gpio-exar.c +++ b/drivers/gpio/gpio-exar.c @@ -69,7 +69,7 @@ static int exar_get(struct gpio_chip *chip, unsigned int reg) value = readb(exar_gpio->regs + reg); mutex_unlock(&exar_gpio->lock); - return !!value; + return value; } static int exar_get_direction(struct gpio_chip *chip, unsigned int offset) @@ -79,7 +79,7 @@ static int exar_get_direction(struct gpio_chip *chip, unsigned int offset) int val; addr = bank ? EXAR_OFFSET_MPIOSEL_HI : EXAR_OFFSET_MPIOSEL_LO; - val = exar_get(chip, addr) >> (offset % 8); + val = exar_get(chip, addr) & BIT(offset % 8); return !!val; } @@ -90,8 +90,8 @@ static int exar_get_value(struct gpio_chip *chip, unsigned int offset) unsigned int addr; int val; - addr = bank ? EXAR_OFFSET_MPIOLVL_LO : EXAR_OFFSET_MPIOLVL_HI; - val = exar_get(chip, addr) >> (offset % 8); + addr = bank ? EXAR_OFFSET_MPIOLVL_HI : EXAR_OFFSET_MPIOLVL_LO; + val = exar_get(chip, addr) & BIT(offset % 8); return !!val; }
First, the logic for translating a register bit to the return code of exar_get_direction and exar_get_value were wrong. And second, there was a flip regarding the register bank in exar_get_direction. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- drivers/gpio/gpio-exar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)