| Message ID | 20220621063524.146604-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 1923433cd660fda6315b8eb1bb8372cf7e85acf7 |
| Headers | show |
| Series | gpio: brcmstb: Make .remove() obviously always return 0 | expand |
On Tue, Jun 21, 2022 at 8:35 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > 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> > --- Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 6b7439b44690..f620f0712134 100644 --- 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,
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> --- drivers/gpio/gpio-brcmstb.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56