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);
         }
 
-        error = gpiochip_remove(&kpad->gc);
-        if (error)
-                dev_warn(dev, "gpiochip_remove failed %d\n", error);
+        gpiochip_remove(&kpad->gc);
 }
 #else
 static inline int adp5589_gpio_add(struct adp5589_kpad *kpad)
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index fce590677b7b..1eb9d3c20886 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -470,14 +470,10 @@ static int ad7879_gpio_add(struct ad7879 *ts,
 static void ad7879_gpio_remove(struct ad7879 *ts)
 {
         const struct ad7879_platform_data *pdata = dev_get_platdata(ts->dev);
-        int ret;
 
-        if (pdata->gpio_export) {
-                ret = gpiochip_remove(&ts->gc);
-                if (ret)
-                        dev_err(ts->dev, "failed to remove gpio %d\n",
-                                ts->gc.base);
-        }
+        if (pdata->gpio_export)
+                gpiochip_remove(&ts->gc);
+
 }
 #else
 static inline int ad7879_gpio_add(struct ad7879 *ts,
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index 4a0e786b7832..5a6363d161a2 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -319,14 +319,8 @@ static int pca9532_destroy_devices(struct pca9532_data *data, int n_devs)
         }
 
 #ifdef CONFIG_LEDS_PCA9532_GPIO
-        if (data->gpio.dev) {
-                int err = gpiochip_remove(&data->gpio);
-                if (err) {
-                        dev_err(&data->client->dev, "%s failed, %d\n",
-                                                "gpiochip_remove()", err);
-                        return err;
-                }
-        }
+        if (data->gpio.dev)
+                gpiochip_remove(&data->gpio);
 #endif
 
         return 0;
diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index 3d9e267a56c4..20fa8e77f186 100644
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -667,11 +667,8 @@ static int tca6507_probe_gpios(struct i2c_client *client,
 
 static void tca6507_remove_gpio(struct tca6507_chip *tca)
 {
-        if (tca->gpio.ngpio) {
-                int err = gpiochip_remove(&tca->gpio);
-                dev_err(&tca->client->dev, "%s failed, %d\n",
-                        "gpiochip_remove()", err);
-        }
+        if (tca->gpio.ngpio)
+                gpiochip_remove(&tca->gpio);
 }
 #else /* CONFIG_GPIOLIB */
 static int tca6507_probe_gpios(struct i2c_client *client,
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 03930d5e9fea..51ef89312615 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -584,18 +584,14 @@ static int cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
 static void cxd2820r_release(struct dvb_frontend *fe)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
-        int uninitialized_var(ret); /* silence compiler warning */
 
         dev_dbg(&priv->i2c->dev, "%s\n", __func__);
 
 #ifdef CONFIG_GPIOLIB
         /* remove GPIOs */
-        if (priv->gpio_chip.label) {
-                ret = gpiochip_remove(&priv->gpio_chip);
-                if (ret)
-                        dev_err(&priv->i2c->dev, "%s: gpiochip_remove() " \
-                                        "failed=%d\n", KBUILD_MODNAME, ret);
-        }
+        if (priv->gpio_chip.label)
+                gpiochip_remove(&priv->gpio_chip);
+
 #endif
         kfree(priv);
         return;
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 9fc4186d4132..977bd3a3eed0 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -605,7 +605,8 @@ static int asic3_gpio_remove(struct platform_device *pdev)
 {
         struct asic3 *asic = platform_get_drvdata(pdev);
 
-        return gpiochip_remove(&asic->gpio);
+        gpiochip_remove(&asic->gpio);
+        return 0;
 }
 
 static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index b44f0203983b..eab3fb028447 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -481,15 +481,9 @@ static int htcpld_register_chip_gpio(
 
         ret = gpiochip_add(&(chip->chip_in));
         if (ret) {
-                int error;
-
                 dev_warn(dev, "Unable to register input GPIOs for 0x%x: %d\n",
                          plat_chip_data->addr, ret);
-
-                error = gpiochip_remove(&(chip->chip_out));
-                if (error)
-                        dev_warn(dev, "Error while trying to unregister gpio chip: %d\n", error);
-
+                gpiochip_remove(&(chip->chip_out));
                 return ret;
         }
 
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 81e6d0932bf0..02027b7f1223 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1047,7 +1047,6 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
         struct sm501_gpio *gpio = &sm->gpio;
         resource_size_t iobase = sm->io_res->start + SM501_GPIO;
         int ret;
-        int tmp;
 
         dev_dbg(sm->dev, "registering gpio block %08llx\n",
                 (unsigned long long)iobase);
@@ -1086,11 +1085,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
         return 0;
 
  err_low_chip:
-        tmp = gpiochip_remove(&gpio->low.gpio);
-        if (tmp) {
-                dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
-                return ret;
-        }
+        gpiochip_remove(&gpio->low.gpio);
 
  err_mapped:
         iounmap(gpio->regs);
@@ -1105,18 +1100,12 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
 static void sm501_gpio_remove(struct sm501_devdata *sm)
 {
         struct sm501_gpio *gpio = &sm->gpio;
-        int ret;
 
         if (!sm->gpio.registered)
                 return;
 
-        ret = gpiochip_remove(&gpio->low.gpio);
-        if (ret)
-                dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
-
-        ret = gpiochip_remove(&gpio->high.gpio);
-        if (ret)
-                dev_err(sm->dev, "cannot remove high chip, cannot tidy up\n");
+        gpiochip_remove(&gpio->low.gpio);
+        gpiochip_remove(&gpio->high.gpio);
 
         iounmap(gpio->regs);
         release_resource(gpio->regs_res);
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 11c19e538551..4fac16bcd732 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -607,7 +607,7 @@ static int tc6393xb_probe(struct platform_device *dev)
         struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
         struct tc6393xb *tc6393xb;
         struct resource *iomem, *rscr;
-        int ret, temp;
+        int ret;
 
         iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (!iomem)
@@ -714,7 +714,7 @@ err_setup:
 
 err_gpio_add:
         if (tc6393xb->gpio.base != -1)
-                temp = gpiochip_remove(&tc6393xb->gpio);
+                gpiochip_remove(&tc6393xb->gpio);
         tcpd->disable(dev);
 err_enable:
         clk_disable(tc6393xb->clk);
@@ -744,13 +744,8 @@ static int tc6393xb_remove(struct platform_device *dev)
 
         tc6393xb_detach_irq(dev);
 
-        if (tc6393xb->gpio.base != -1) {
-                ret = gpiochip_remove(&tc6393xb->gpio);
-                if (ret) {
-                        dev_err(&dev->dev, "Can't remove gpio chip: %d\n", ret);
-                        return ret;
-                }
-        }
+        if (tc6393xb->gpio.base != -1)
+                gpiochip_remove(&tc6393xb->gpio);
 
         ret = tcpd->disable(dev);
         clk_disable(tc6393xb->clk);
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 153d595afaac..58ea9fdd3a15 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -621,7 +621,6 @@ static void ucb1x00_remove(struct mcp *mcp)
         struct ucb1x00_plat_data *pdata = mcp->attached_device.platform_data;
         struct ucb1x00 *ucb = mcp_get_drvdata(mcp);
         struct list_head *l, *n;
-        int ret;
 
         mutex_lock(&ucb1x00_mutex);
         list_del(&ucb->node);
@@ -631,11 +630,8 @@ static void ucb1x00_remove(struct mcp *mcp)
         }
         mutex_unlock(&ucb1x00_mutex);
 
-        if (ucb->gpio.base != -1) {
-                ret = gpiochip_remove(&ucb->gpio);
-                if (ret)
-                        dev_err(&ucb->dev, "Can't remove gpio chip: %d\n", ret);
-        }
+        if (ucb->gpio.base != -1)
+                gpiochip_remove(&ucb->gpio);
 
         irq_set_chained_handler(ucb->irq, NULL);
         irq_free_descs(ucb->irq_base, 16);
diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 40929e4f7ad7..04fed00b88e9 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -301,8 +301,7 @@ static int platform_pmic_gpio_probe(struct platform_device *pdev)
         return 0;
 
 fail_request_irq:
-        if (gpiochip_remove(&pg->chip))
-                pr_err("gpiochip_remove failed\n");
+        gpiochip_remove(&pg->chip);
 err:
         iounmap(pg->gpiointr);
 err2:
diff --git a/drivers/ssb/driver_gpio.c b/drivers/ssb/driver_gpio.c
index ba350d2035c0..f92e266d48f8 100644
--- a/drivers/ssb/driver_gpio.c
+++ b/drivers/ssb/driver_gpio.c
@@ -475,7 +475,8 @@ int ssb_gpio_unregister(struct ssb_bus *bus)
 {
         if (ssb_chipco_available(&bus->chipco) ||
             ssb_extif_available(&bus->extif)) {
-                return gpiochip_remove(&bus->gpio);
+                gpiochip_remove(&bus->gpio);
+                return 0;
         } else {
                 SSB_WARN_ON(1);
         }
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index f00af0786af3..3304d9227c3c 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -221,9 +221,7 @@ void pio2_gpio_exit(struct pio2_card *card)
 {
         const char *label = card->gc.label;
 
-        if (gpiochip_remove(&(card->gc)))
-                dev_err(&card->vdev->dev, "Failed to remove GPIO\n");
-
+        gpiochip_remove(&(card->gc));
         kfree(label);
 }
 
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 82573dc4d8cf..0041a64cc86e 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1248,7 +1248,7 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
         mutex_destroy(&s->mutex);
 
 #ifdef CONFIG_GPIOLIB
-        WARN_ON(gpiochip_remove(&s->gpio));
+        gpiochip_remove(&s->gpio);
 
 out_uart:
 #endif
@@ -1263,12 +1263,10 @@ out_clk:
 static int max310x_remove(struct device *dev)
 {
         struct max310x_port *s = dev_get_drvdata(dev);
-        int i, ret = 0;
+        int i;
 
 #ifdef CONFIG_GPIOLIB
-        ret = gpiochip_remove(&s->gpio);
-        if (ret)
-                return ret;
+        gpiochip_remove(&s->gpio);
 #endif
 
         for (i = 0; i < s->uart.nr; i++) {
@@ -1282,7 +1280,7 @@ static int max310x_remove(struct device *dev)
         uart_unregister_driver(&s->uart);
         clk_disable_unprepare(s->clk);
 
-        return ret;
+        return 0;
 }
 
 static const struct of_device_id __maybe_unused max310x_dt_ids[] = {
diff --git a/drivers/video/fbdev/via/via-gpio.c b/drivers/video/fbdev/via/via-gpio.c
index e408679081ab..6f433b8cee12 100644
--- a/drivers/video/fbdev/via/via-gpio.c
+++ b/drivers/video/fbdev/via/via-gpio.c
@@ -270,7 +270,7 @@ static int viafb_gpio_probe(struct platform_device *platdev)
 static int viafb_gpio_remove(struct platform_device *platdev)
 {
         unsigned long flags;
-        int ret = 0, i;
+        int i;
 
 #ifdef CONFIG_PM
         viafb_pm_unregister(&viafb_gpio_pm_hooks);
@@ -280,11 +280,7 @@ static int viafb_gpio_remove(struct platform_device *platdev)
          * Get unregistered.
          */
         if (viafb_gpio_config.gpio_chip.ngpio > 0) {
-                ret = gpiochip_remove(&viafb_gpio_config.gpio_chip);
-                if (ret) { /* Somebody still using it? */
-                        printk(KERN_ERR "Viafb: GPIO remove failed\n");
-                        return ret;
-                }
+                gpiochip_remove(&viafb_gpio_config.gpio_chip);
         }
         /*
          * Disable the ports.
@@ -294,7 +290,7 @@ static int viafb_gpio_remove(struct platform_device *platdev)
                 viafb_gpio_disable(viafb_gpio_config.active_gpios[i]);
         viafb_gpio_config.gpio_chip.ngpio = 0;
         spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
-        return ret;
+        return 0;
 }
 
 static struct platform_driver via_gpio_driver = {
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 7bb0d36d4c54..a01ad629ed61 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2319,11 +2319,8 @@ static void wm5100_init_gpio(struct i2c_client *i2c)
 static void wm5100_free_gpio(struct i2c_client *i2c)
 {
         struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c);
-        int ret;
 
-        ret = gpiochip_remove(&wm5100->gpio_chip);
-        if (ret != 0)
-                dev_err(&i2c->dev, "Failed to remove GPIOs: %d\n", ret);
+        gpiochip_remove(&wm5100->gpio_chip);
 }
 #else
 static void wm5100_init_gpio(struct i2c_client *i2c)
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index aa0984864e76..c038b3e04398 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1877,11 +1877,7 @@ static void wm8903_init_gpio(struct wm8903_priv *wm8903)
 
 static void wm8903_free_gpio(struct wm8903_priv *wm8903)
 {
-        int ret;
-
-        ret = gpiochip_remove(&wm8903->gpio_chip);
-        if (ret != 0)
-                dev_err(wm8903->dev, "Failed to remove GPIOs: %d\n", ret);
+        gpiochip_remove(&wm8903->gpio_chip);
 }
 #else
 static void wm8903_init_gpio(struct wm8903_priv *wm8903)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 1098ae32f1f9..9077411e62ce 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3398,11 +3398,8 @@ static void wm8962_init_gpio(struct snd_soc_codec *codec)
 static void wm8962_free_gpio(struct snd_soc_codec *codec)
 {
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
-        int ret;
 
-        ret = gpiochip_remove(&wm8962->gpio_chip);
-        if (ret != 0)
-                dev_err(codec->dev, "Failed to remove GPIOs: %d\n", ret);
+        gpiochip_remove(&wm8962->gpio_chip);
 }
 #else
 static void wm8962_init_gpio(struct snd_soc_codec *codec)
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index f16ff4f56923..b1dcc11c1b23 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2216,11 +2216,7 @@ static void wm8996_init_gpio(struct wm8996_priv *wm8996)
 
 static void wm8996_free_gpio(struct wm8996_priv *wm8996)
 {
-        int ret;
-
-        ret = gpiochip_remove(&wm8996->gpio_chip);
-        if (ret != 0)
-                dev_err(wm8996->dev, "Failed to remove GPIOs: %d\n", ret);
+        gpiochip_remove(&wm8996->gpio_chip);
 }
 #else
 static void wm8996_init_gpio(struct wm8996_priv *wm8996)