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

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

diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c
index 3df3ebdb3e5267f5e4ea1575ff9d6217a950f36a..de18591ff11e327d605299c5e457428c5f11ab12 100644 (file)
--- a/drivers/gpio/gpio-ts5500.c
+++ b/drivers/gpio/gpio-ts5500.c
@@ -427,8 +427,7 @@ static int ts5500_dio_probe(struct platform_device *pdev)
 
        return 0;
 cleanup:
-       if (gpiochip_remove(&priv->gpio_chip))
-               dev_err(dev, "failed to remove gpio chip\n");
+       gpiochip_remove(&priv->gpio_chip);
        return ret;
 }
 
@@ -437,7 +436,8 @@ static int ts5500_dio_remove(struct platform_device *pdev)
        struct ts5500_priv *priv = platform_get_drvdata(pdev);
 
        ts5500_disable_irq(priv);
-       return gpiochip_remove(&priv->gpio_chip);
+       gpiochip_remove(&priv->gpio_chip);
+       return 0;
 }
 
 static struct platform_device_id ts5500_dio_ids[] = {