pinctrl: 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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

6 files changed, 10 insertions, 39 deletions

diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index a53a689a2bfa..7df34b70e8b6 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -1298,10 +1298,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
         return 0;
 
 out_rem_chip:
-        err = gpiochip_remove(&pct->chip);
-        if (err)
-                dev_info(&pdev->dev, "failed to remove gpiochip\n");
-
+        gpiochip_remove(&pct->chip);
         return ret;
 }
 
@@ -1312,15 +1309,8 @@ out_rem_chip:
 static int abx500_gpio_remove(struct platform_device *pdev)
 {
         struct abx500_pinctrl *pct = platform_get_drvdata(pdev);
-        int ret;
-
-        ret = gpiochip_remove(&pct->chip);
-        if (ret < 0) {
-                dev_err(pct->dev, "unable to remove gpiochip: %d\n",
-                        ret);
-                return ret;
-        }
 
+        gpiochip_remove(&pct->chip);
         return 0;
 }
 
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index e7cab07eef47..4332b38c52ab 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -1261,7 +1261,7 @@ static int nmk_gpio_probe(struct platform_device *dev)
                                    IRQ_TYPE_EDGE_FALLING);
         if (ret) {
                 dev_err(&dev->dev, "could not add irqchip\n");
-                ret = gpiochip_remove(&nmk_chip->chip);
+                gpiochip_remove(&nmk_chip->chip);
                 return -ENODEV;
         }
         /* Then register the chain on the parent IRQ */
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index 2738108caff2..041677113a48 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -903,16 +903,9 @@ EXPORT_SYMBOL(msm_pinctrl_probe);
 int msm_pinctrl_remove(struct platform_device *pdev)
 {
         struct msm_pinctrl *pctrl = platform_get_drvdata(pdev);
-        int ret;
-
-        ret = gpiochip_remove(&pctrl->chip);
-        if (ret) {
-                dev_err(&pdev->dev, "Failed to remove gpiochip\n");
-                return ret;
-        }
 
+        gpiochip_remove(&pctrl->chip);
         pinctrl_unregister(pctrl->pctrl);
-
         return 0;
 }
 EXPORT_SYMBOL(msm_pinctrl_remove);
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos5440.c b/drivers/pinctrl/samsung/pinctrl-exynos5440.c
index 603da2f9dd95..8ef370244aee 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos5440.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos5440.c
@@ -873,11 +873,7 @@ static int exynos5440_gpiolib_register(struct platform_device *pdev,
 static int exynos5440_gpiolib_unregister(struct platform_device *pdev,
                                 struct exynos5440_pinctrl_priv_data *priv)
 {
-        int ret = gpiochip_remove(priv->gc);
-        if (ret) {
-                dev_err(&pdev->dev, "gpio chip remove failed\n");
-                return ret;
-        }
+        gpiochip_remove(priv->gc);
         return 0;
 }
 
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index b07406da333c..83faddf456e0 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -945,9 +945,7 @@ static int samsung_gpiolib_register(struct platform_device *pdev,
 
 fail:
         for (--i, --bank; i >= 0; --i, --bank)
-                if (gpiochip_remove(&bank->gpio_chip))
-                        dev_err(&pdev->dev, "gpio chip %s remove failed\n",
-                                                        bank->gpio_chip.label);
+                gpiochip_remove(&bank->gpio_chip);
         return ret;
 }
 
@@ -957,16 +955,11 @@ static int samsung_gpiolib_unregister(struct platform_device *pdev,
 {
         struct samsung_pin_ctrl *ctrl = drvdata->ctrl;
         struct samsung_pin_bank *bank = ctrl->pin_banks;
-        int ret = 0;
         int i;
 
-        for (i = 0; !ret && i < ctrl->nr_banks; ++i, ++bank)
-                ret = gpiochip_remove(&bank->gpio_chip);
-
-        if (ret)
-                dev_err(&pdev->dev, "gpio chip remove failed\n");
-
-        return ret;
+        for (i = 0; i < ctrl->nr_banks; ++i, ++bank)
+                gpiochip_remove(&bank->gpio_chip);
+        return 0;
 }
 
 static const struct of_device_id samsung_pinctrl_dt_match[];
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index 4c1d7c68666d..25eefdbb76b6 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -877,8 +877,7 @@ static int sirfsoc_gpio_probe(struct device_node *np)
 
 out_no_range:
 out_banks:
-        if (gpiochip_remove(&sgpio->chip.gc))
-                dev_err(&pdev->dev, "could not remove gpio chip\n");
+        gpiochip_remove(&sgpio->chip.gc);
 out:
         iounmap(regs);
         return err;