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

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

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index efc7c129016d1d748f9c9a837956ced99cee0471..a685a3cbbc81da371fd4863cc50149487fda3fba 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -307,7 +307,6 @@ static int timbgpio_probe(struct platform_device *pdev)
 
 static int timbgpio_remove(struct platform_device *pdev)
 {
-       int err;
        struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct timbgpio *tgpio = platform_get_drvdata(pdev);
        int irq = platform_get_irq(pdev, 0);
@@ -323,9 +322,7 @@ static int timbgpio_remove(struct platform_device *pdev)
                irq_set_handler_data(irq, NULL);
        }
 
-       err = gpiochip_remove(&tgpio->gpio);
-       if (err)
-               printk(KERN_ERR DRIVER_NAME": failed to remove gpio_chip\n");
+       gpiochip_remove(&tgpio->gpio);
 
        return 0;
 }