Commit daec0bed authored by Linus Walleij's avatar Linus Walleij

Merge branch 'error-return-from-get' into devel

parents 5041e791 a80bb4c9
...@@ -1159,7 +1159,7 @@ static int bfin_gpiolib_direction_output(struct gpio_chip *chip, unsigned gpio, ...@@ -1159,7 +1159,7 @@ static int bfin_gpiolib_direction_output(struct gpio_chip *chip, unsigned gpio,
static int bfin_gpiolib_get_value(struct gpio_chip *chip, unsigned gpio) static int bfin_gpiolib_get_value(struct gpio_chip *chip, unsigned gpio)
{ {
return bfin_gpio_get_value(gpio); return !!bfin_gpio_get_value(gpio);
} }
static void bfin_gpiolib_set_value(struct gpio_chip *chip, unsigned gpio, int value) static void bfin_gpiolib_set_value(struct gpio_chip *chip, unsigned gpio, int value)
......
...@@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio) ...@@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct ppc4xx_gpio __iomem *regs = mm_gc->regs; struct ppc4xx_gpio __iomem *regs = mm_gc->regs;
return in_be32(&regs->ir) & GPIO_MASK(gpio); return !!(in_be32(&regs->ir) & GPIO_MASK(gpio));
} }
static inline void static inline void
......
...@@ -46,7 +46,7 @@ static int u8_gpio_get(struct gpio_chip *gc, unsigned int gpio) ...@@ -46,7 +46,7 @@ static int u8_gpio_get(struct gpio_chip *gc, unsigned int gpio)
{ {
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
return in_8(mm_gc->regs) & u8_pin2mask(gpio); return !!(in_8(mm_gc->regs) & u8_pin2mask(gpio));
} }
static void u8_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) static void u8_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
......
...@@ -52,7 +52,7 @@ device_initcall(puv3_gpio_leds_init); ...@@ -52,7 +52,7 @@ device_initcall(puv3_gpio_leds_init);
static int puv3_gpio_get(struct gpio_chip *chip, unsigned offset) static int puv3_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
return readl(GPIO_GPLR) & GPIO_GPIO(offset); return !!(readl(GPIO_GPLR) & GPIO_GPIO(offset));
} }
static void puv3_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void puv3_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
......
...@@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio) ...@@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
struct qe_pio_regs __iomem *regs = mm_gc->regs; struct qe_pio_regs __iomem *regs = mm_gc->regs;
u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio); u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
return in_be32(&regs->cpdata) & pin_mask; return !!(in_be32(&regs->cpdata) & pin_mask);
} }
static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment