diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-06-14 17:23:39 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2022-07-19 09:56:51 +0200 |
| commit | 421e3c16c32ad37b7124ae663d61e50546a57f68 (patch) | |
| tree | 5fadd945d08afa80942a1b9fc02a1015606e0d49 /drivers/gpio | |
| parent | 2a1192ff0835cb4b0ccd6f6e85c93aa0dc6f66b7 (diff) | |
| download | linux-stable-421e3c16c32ad37b7124ae663d61e50546a57f68.tar.gz linux-stable-421e3c16c32ad37b7124ae663d61e50546a57f68.tar.bz2 linux-stable-421e3c16c32ad37b7124ae663d61e50546a57f68.zip | |
gpio: twl4030: Don't return an error after WARN in .remove
Returning a non-zero value in a platform driver's remove callback only
results in an error message ("remove callback returned a non-zero value.
This will be ignored.", see platform_remove()), and then the device is
removed anyhow.
As there was just a WARN_ON triggered, return 0 to drop the follow up
warning. The latter output is hardly relevant after the big WARN splat.
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>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-twl4030.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c index e2cb7cb90c8c..5046e51af8df 100644 --- a/drivers/gpio/gpio-twl4030.c +++ b/drivers/gpio/gpio-twl4030.c @@ -597,12 +597,9 @@ static int gpio_twl4030_remove(struct platform_device *pdev) gpiochip_remove(&priv->gpio_chip); - if (is_module()) - return 0; - /* REVISIT no support yet for deregistering all the IRQs */ - WARN_ON(1); - return -EIO; + WARN_ON(!is_module()); + return 0; } static const struct of_device_id twl_gpio_match[] = { |