Skip to content

Commit da24118

Browse files
Uwe Kleine-KönigWim Van Sebroeck
authored andcommitted
watchdog: txx9wdt: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20231106154807.3866712-6-u.kleine-koenig@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 2faef27 commit da24118

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/watchdog/txx9wdt.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,11 @@ static int txx9wdt_probe(struct platform_device *dev)
145145
return ret;
146146
}
147147

148-
static int txx9wdt_remove(struct platform_device *dev)
148+
static void txx9wdt_remove(struct platform_device *dev)
149149
{
150150
watchdog_unregister_device(&txx9wdt);
151151
clk_disable_unprepare(txx9_imclk);
152152
clk_put(txx9_imclk);
153-
return 0;
154153
}
155154

156155
static void txx9wdt_shutdown(struct platform_device *dev)
@@ -160,7 +159,7 @@ static void txx9wdt_shutdown(struct platform_device *dev)
160159

161160
static struct platform_driver txx9wdt_driver = {
162161
.probe = txx9wdt_probe,
163-
.remove = txx9wdt_remove,
162+
.remove_new = txx9wdt_remove,
164163
.shutdown = txx9wdt_shutdown,
165164
.driver = {
166165
.name = "txx9wdt",

0 commit comments

Comments
 (0)