gpio: brcmstb: Make .remove() obviously always return 0

priv cannot be NULL because brcmstb_gpio_probe() calls
platform_set_drvdata() with a non-NULL argument, so the check for !priv can
be dropped.

Also remove the variable ret that is only used to hide a bit that in the
end zero is returned.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 6b7439b44690901ba4a88b3c60ba14283d1114bc..f620f07121348f7506bc38060dca15222ca72a64 100644 (file)
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -385,12 +385,7 @@ static int brcmstb_gpio_remove(struct platform_device *pdev)
 {
        struct brcmstb_gpio_priv *priv = platform_get_drvdata(pdev);
        struct brcmstb_gpio_bank *bank;
-       int offset, ret = 0, virq;
-
-       if (!priv) {
-               dev_err(&pdev->dev, "called %s without drvdata!\n", __func__);
-               return -EFAULT;
-       }
+       int offset, virq;
 
        if (priv->parent_irq > 0)
                irq_set_chained_handler_and_data(priv->parent_irq, NULL, NULL);
@@ -411,7 +406,7 @@ static int brcmstb_gpio_remove(struct platform_device *pdev)
        list_for_each_entry(bank, &priv->bank_list, node)
                gpiochip_remove(&bank->gc);
 
-       return ret;
+       return 0;
 }
 
 static int brcmstb_gpio_of_xlate(struct gpio_chip *gc,