gpio: remove remaining users of gpiochip_remove() retval

Some drivers accidentally still use the return value from
gpiochip_remove(). Get rid of them so we can simplify this function
and get rid of the return value.

Cc: Abdoulaye Berthe <berthe.ab@gmail.com>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 934462f5bd2224ef872fa4c155fe5998ff47e273..e3712f0e51ab82ba5f28a122e56c36f5d36121a6 100644 (file)
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -346,7 +346,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
        return 0;
 
 out_remove_gpio:
-       WARN_ON(gpiochip_remove(&cg->chip));
+       gpiochip_remove(&cg->chip);
        return retval;
 }
 
@@ -354,14 +354,11 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
 {
        struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
        int irq = platform_get_irq(pdev, 0);
-       int err;
-
-       err = gpiochip_remove(&cg->chip);
 
+       gpiochip_remove(&cg->chip);
        if (irq >= 0)
                free_irq(irq, cg);
-
-       return err;
+       return 0;
 }
 
 static struct platform_driver crystalcove_gpio_driver = {

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 174932165fcb5d8795c992506bd0584c0bebb8e5..5cd33677a0184f9160cc07d2329912db0d887b5f 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1143,7 +1143,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank)
 
        if (ret) {
                dev_err(bank->dev, "Couldn't add irqchip to gpiochip %d\n", ret);
-               ret = gpiochip_remove(&bank->chip);
+               gpiochip_remove(&bank->chip);
                return -ENODEV;
        }
 

diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index e25ba14fbb640cd8fa0dfdafbc251f4dcaa5dee1..f1944d496c3b4bae4210c6db4cdd165c0e97e428 100644 (file)
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -216,12 +216,9 @@ err:
 static int xgene_gpio_remove(struct platform_device *pdev)
 {
        struct xgene_gpio *gpio = platform_get_drvdata(pdev);
-       int ret = 0;
 
-       ret = gpiochip_remove(&gpio->chip);
-       if (ret)
-               dev_err(&pdev->dev, "unable to remove gpio_chip.\n");
-       return ret;
+       gpiochip_remove(&gpio->chip);
+       return 0;
 }
 
 #ifdef CONFIG_OF

diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index 5dfbced248153841aeb36e7236e3dad4f3066055..74cd480bf8de6975a8a3be485798255eca2cc431 100644 (file)
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -686,16 +686,10 @@ err_disable_clk:
  */
 static int zynq_gpio_remove(struct platform_device *pdev)
 {
-       int ret;
        struct zynq_gpio *gpio = platform_get_drvdata(pdev);
 
        pm_runtime_get_sync(&pdev->dev);
-
-       ret = gpiochip_remove(&gpio->chip);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to remove gpio chip\n");
-               return ret;
-       }
+       gpiochip_remove(&gpio->chip);
        clk_disable_unprepare(gpio->clk);
        device_set_wakeup_capable(&pdev->dev, 0);
        return 0;