driver:gpio remove all usage of gpio_remove retval in driver

this remove all reference to gpio_remove retval in all driver
except pinctrl and gpio. the same thing is done for gpio and
pinctrl in two different patches.

Signed-off-by: Abdoulaye Berthe <berthe.ab@gmail.com>
Acked-by: Michael Büsch <m@bues.ch>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

27 files changed, 52 insertions, 129 deletions

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index a20fa80776d3..45f4c21e393c 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -243,18 +243,12 @@ err_ioremap:
 static int scoop_remove(struct platform_device *pdev)
 {
         struct scoop_dev *sdev = platform_get_drvdata(pdev);
-        int ret;
 
         if (!sdev)
                 return -EINVAL;
 
-        if (sdev->gpio.base != -1) {
-                ret = gpiochip_remove(&sdev->gpio);
-                if (ret) {
-                        dev_err(&pdev->dev, "Can't remove gpio chip: %d\n", ret);
-                        return ret;
-                }
-        }
+        if (sdev->gpio.base != -1)
+                gpiochip_remove(&sdev->gpio);
 
         platform_set_drvdata(pdev, NULL);
         iounmap(sdev->base);
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 9ff200ae1c9a..2791b8641df6 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -789,11 +789,11 @@ void __init txx9_iocled_init(unsigned long baseaddr,
         if (platform_device_add(pdev))
                 goto out_pdev;
         return;
+
 out_pdev:
         platform_device_put(pdev);
 out_gpio:
-        if (gpiochip_remove(&iocled->chip))
-                return;
+        gpiochip_remove(&iocled->chip);
 out_unmap:
         iounmap(iocled->mmioaddr);
 out_free:
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index e238b6a55b15..73997027b085 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -141,7 +141,8 @@ static int mcu_gpiochip_add(struct mcu *mcu)
 
 static int mcu_gpiochip_remove(struct mcu *mcu)
 {
-        return gpiochip_remove(&mcu->gc);
+        gpiochip_remove(&mcu->gc);
+        return 0;
 }
 
 static int mcu_probe(struct i2c_client *client, const struct i2c_device_id *id)
diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3proto/gpio.c
index 3ea65e9b56e8..f035a7ac6456 100644
--- a/arch/sh/boards/mach-x3proto/gpio.c
+++ b/arch/sh/boards/mach-x3proto/gpio.c
@@ -128,10 +128,8 @@ int __init x3proto_gpio_setup(void)
         return 0;
 
 err_irq:
-        ret = gpiochip_remove(&x3proto_gpio_chip);
-        if (unlikely(ret))
-                pr_err("Failed deregistering GPIO\n");
-
+        gpiochip_remove(&x3proto_gpio_chip);
+        ret = 0;
 err_gpio:
         synchronize_irq(ilsel);
 
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index aec9f850b4a8..710fa62dd5ae 100644
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -251,5 +251,6 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
 int bcma_gpio_unregister(struct bcma_drv_cc *cc)
 {
         bcma_gpio_irq_domain_exit(cc);
-        return gpiochip_remove(&cc->gpio);
+        gpiochip_remove(&cc->gpio);
+        return 0;
 }
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index 1e6f19a07454..5dfbced24815 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -671,8 +671,7 @@ static int zynq_gpio_probe(struct platform_device *pdev)
         return 0;
 
 err_rm_gpiochip:
-        if (gpiochip_remove(chip))
-                dev_err(&pdev->dev, "Failed to remove gpio chip\n");
+        gpiochip_remove(chip);
 err_disable_clk:
         clk_disable_unprepare(gpio->clk);
 
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index a822db5a8338..3318de690e00 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -1069,8 +1069,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
         return ret;
 
 err_gpiochip_remove:
-        if (gpiochip_remove(&dev->gc) < 0)
-                hid_err(hdev, "error removing gpio chip\n");
+        gpiochip_remove(&dev->gc);
 err_free_i2c:
         i2c_del_adapter(&dev->adap);
 err_free_dev:
@@ -1089,8 +1088,7 @@ static void cp2112_remove(struct hid_device *hdev)
         struct cp2112_device *dev = hid_get_drvdata(hdev);
 
         sysfs_remove_group(&hdev->dev.kobj, &cp2112_attr_group);
-        if (gpiochip_remove(&dev->gc))
-                hid_err(hdev, "unable to remove gpio chip\n");
+        gpiochip_remove(&dev->gc);
         i2c_del_adapter(&dev->adap);
         /* i2c_del_adapter has finished removing all i2c devices from our
          * adapter. Well behaved devices should no longer call our cp2112_xfer
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 5ef7fcf0e250..b97ed443e0a4 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -251,9 +251,7 @@ static void adp5588_gpio_remove(struct adp5588_kpad *kpad)
                         dev_warn(dev, "teardown failed %d\n", error);
         }
 
-        error = gpiochip_remove(&kpad->gc);
-        if (error)
-                dev_warn(dev, "gpiochip_remove failed %d\n", error);
+        gpiochip_remove(&kpad->gc);
 }
 #else
 static inline int adp5588_gpio_add(struct adp5588_kpad *kpad)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 6329549bf6ad..a45267729dfc 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -567,9 +567,7 @@ static void adp5589_gpio_remove(struct adp5589_kpad *kpad)
                         dev_warn(dev, "teardown failed %d\n", error);