4 files changed, 8 insertions, 15 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);