diff options
| author | Neil Zhang <zhangwm@marvell.com> | 2014-01-09 04:25:57 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-01-15 02:56:20 -0500 |
| commit | 3018fd81310688c3dfe8938a98680a9341982d02 (patch) | |
| tree | 19fa9b94ffbb39a221945be1498b075b675ccd01 /drivers/gpio | |
| parent | 364374121b78ec599b10dd84648ccceb4d037285 (diff) | |
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')
| -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, | |||
| 263 | 263 | ||
| 264 | static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset) | 264 | static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset) |
| 265 | { | 265 | { |
| 266 | return readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET) & (1 << offset); | 266 | u32 gplr = readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET); |
| 267 | return !!(gplr & (1 << offset)); | ||
| 267 | } | 268 | } |
| 268 | 269 | ||
| 269 | static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | 270 | static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |
