[tip:,timers/core] clocksource/drivers/timer-ti-dm: Convert to platform remove callback returning void

Message ID 168250035161.404.623276263898104408.tip-bot2@tip-bot2
State New
Headers
Series [tip:,timers/core] clocksource/drivers/timer-ti-dm: Convert to platform remove callback returning void |

Commit Message

tip-bot2 for Thomas Gleixner April 26, 2023, 9:12 a.m. UTC
  The following commit has been merged into the timers/core branch of tip:

Commit-ID:     b1f0390048e2641d3451f8cdbbef24c79d1a8fdd
Gitweb:        https://git.kernel.org/tip/b1f0390048e2641d3451f8cdbbef24c79d1a8fdd
Author:        Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
AuthorDate:    Mon, 13 Mar 2023 08:54:30 +01:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Mon, 24 Apr 2023 16:56:13 +02:00

clocksource/drivers/timer-ti-dm: 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 (mostly) ignored
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.

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>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230313075430.2730803-6-u.kleine-koenig@pengutronix.de
---
 drivers/clocksource/timer-ti-dm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
  

Patch

diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index 098562b..ab7a6ca 100644
--- a/drivers/clocksource/timer-ti-dm.c
+++ b/drivers/clocksource/timer-ti-dm.c
@@ -1177,7 +1177,7 @@  err_disable:
  * In addition to freeing platform resources it also deletes the timer
  * entry from the local list.
  */
-static int omap_dm_timer_remove(struct platform_device *pdev)
+static void omap_dm_timer_remove(struct platform_device *pdev)
 {
 	struct dmtimer *timer;
 	unsigned long flags;
@@ -1199,8 +1199,6 @@  static int omap_dm_timer_remove(struct platform_device *pdev)
 
 	if (ret)
 		dev_err(&pdev->dev, "Unable to determine timer entry in list of drivers on remove\n");
-
-	return 0;
 }
 
 static const struct omap_dm_timer_ops dmtimer_ops = {
@@ -1275,7 +1273,7 @@  MODULE_DEVICE_TABLE(of, omap_timer_match);
 
 static struct platform_driver omap_dm_timer_driver = {
 	.probe  = omap_dm_timer_probe,
-	.remove = omap_dm_timer_remove,
+	.remove_new = omap_dm_timer_remove,
 	.driver = {
 		.name   = "omap_timer",
 		.of_match_table = omap_timer_match,