diff options
| author | Neil Zhang <zhangwm@marvell.com> | 2014-01-09 10:25:57 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-01-15 08:56:20 +0100 |
| commit | 3018fd81310688c3dfe8938a98680a9341982d02 (patch) | |
| tree | 19fa9b94ffbb39a221945be1498b075b675ccd01 /drivers/gpio/gpio-pxa.c | |
| parent | ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h> (diff) | |
| download | linux-3018fd81310688c3dfe8938a98680a9341982d02.tar.xz linux-3018fd81310688c3dfe8938a98680a9341982d02.zip | |
gpio: pxa: clamp gpio get value to [0,1]
It would be convenient to normalize the return value for gpio_get.
I have checked mach-mmp / mach-pxa / plat-pxa / plat-orion / mach-orion5x.
It's OK for all of them to change this function to return 0 and 1.
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index cc13d1b74fad..42e6e64f2120 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -263,7 +263,8 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip, static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset) { - return readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET) & (1 << offset); + u32 gplr = readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET); + return !!(gplr & (1 << offset)); } static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |