Skip to content

Commit 03a5a75

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: rcar: 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 <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Reviewed-by: Wolfram Sang <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a07f448 commit 03a5a75

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/thermal/rcar_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static irqreturn_t rcar_thermal_irq(int irq, void *data)
371371
/*
372372
* platform functions
373373
*/
374-
static int rcar_thermal_remove(struct platform_device *pdev)
374+
static void rcar_thermal_remove(struct platform_device *pdev)
375375
{
376376
struct rcar_thermal_common *common = platform_get_drvdata(pdev);
377377
struct device *dev = &pdev->dev;
@@ -388,8 +388,6 @@ static int rcar_thermal_remove(struct platform_device *pdev)
388388

389389
pm_runtime_put(dev);
390390
pm_runtime_disable(dev);
391-
392-
return 0;
393391
}
394392

395393
static int rcar_thermal_probe(struct platform_device *pdev)
@@ -581,7 +579,7 @@ static struct platform_driver rcar_thermal_driver = {
581579
.of_match_table = rcar_thermal_dt_ids,
582580
},
583581
.probe = rcar_thermal_probe,
584-
.remove = rcar_thermal_remove,
582+
.remove_new = rcar_thermal_remove,
585583
};
586584
module_platform_driver(rcar_thermal_driver);
587585

0 commit comments

Comments
 (0)