Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpio / gpio-rcar.c

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index b6ae89ea88119b2b1d35b522f64e07470d20a8dc..bf6c09450feed3c0477a29947fe94e260c93ed1a 100644 (file)
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -240,9 +240,9 @@ static int gpio_rcar_get(struct gpio_chip *chip, unsigned offset)
        /* testing on r8a7790 shows that INDT does not show correct pin state
         * when configured as output, so use OUTDT in case of output pins */
        if (gpio_rcar_read(gpio_to_priv(chip), INOUTSEL) & bit)
-               return (int)(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
+               return !!(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
        else
-               return (int)(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
+               return !!(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
 }
 
 static void gpio_rcar_set(struct gpio_chip *chip, unsigned offset, int value)
@@ -472,11 +472,8 @@ err0:
 static int gpio_rcar_remove(struct platform_device *pdev)
 {
        struct gpio_rcar_priv *p = platform_get_drvdata(pdev);
-       int ret;
 
-       ret = gpiochip_remove(&p->gpio_chip);
-       if (ret)
-               return ret;
+       gpiochip_remove(&p->gpio_chip);
 
        irq_domain_remove(p->irq_domain);
        pm_runtime_put(&pdev->dev);