path: root/drivers/watchdog
diff options
authorUwe Kleine-König <>2021-01-26 17:58:34 +0100
committerUwe Kleine-König <>2021-02-02 14:25:50 +0100
commit3fd269e74f2feec973f45ee11d822faeda4fe284 (patch)
tree925ab2b96265da4ccdfc7b1aaf29074d895891be /drivers/watchdog
parent5b495ac8fe03b9e0d2e775f9064c3e2a340ff440 (diff)
amba: Make the remove callback return void
All amba drivers return 0 in their remove callback. Together with the driver core ignoring the return value anyhow, it doesn't make sense to return a value here. Change the remove prototype to return void, which makes it explicit that returning an error value doesn't work as expected. This simplifies changing the core remove callback to return void, too. Reviewed-by: Ulf Hansson <> Reviewed-by: Arnd Bergmann <> Acked-by: Alexandre Belloni <> Acked-by: Dmitry Torokhov <> Acked-by: Krzysztof Kozlowski <> # for drivers/memory Acked-by: Mark Brown <> Acked-by: Linus Walleij <> Acked-by: Suzuki K Poulose <> # for hwtracing/coresight Acked-By: Vinod Koul <> # for dmaengine Acked-by: Guenter Roeck <> # for watchdog Acked-by: Wolfram Sang <> # for I2C Acked-by: Takashi Iwai <> # for sound Acked-by: Vladimir Zapolskiy <> # for memory/pl172 Acked-by: Greg Kroah-Hartman <> Link: Signed-off-by: Uwe Kleine-König <>
Diffstat (limited to 'drivers/watchdog')
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 958dc32a708f..58a00e1ab23b 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -305,14 +305,12 @@ err:
return ret;
-static int sp805_wdt_remove(struct amba_device *adev)
+static void sp805_wdt_remove(struct amba_device *adev)
struct sp805_wdt *wdt = amba_get_drvdata(adev);
watchdog_set_drvdata(&wdt->wdd, NULL);
- return 0;
static int __maybe_unused sp805_wdt_suspend(struct device *dev)