Skip to content

Commit f29ecd3

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: bcm2835: 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> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 4347e7d commit f29ecd3

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/broadcom/bcm2835_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,19 +282,17 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
282282
return err;
283283
}
284284

285-
static int bcm2835_thermal_remove(struct platform_device *pdev)
285+
static void bcm2835_thermal_remove(struct platform_device *pdev)
286286
{
287287
struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);
288288

289289
debugfs_remove_recursive(data->debugfsdir);
290290
clk_disable_unprepare(data->clk);
291-
292-
return 0;
293291
}
294292

295293
static struct platform_driver bcm2835_thermal_driver = {
296294
.probe = bcm2835_thermal_probe,
297-
.remove = bcm2835_thermal_remove,
295+
.remove_new = bcm2835_thermal_remove,
298296
.driver = {
299297
.name = "bcm2835_thermal",
300298
.of_match_table = bcm2835_thermal_of_match_table,

0 commit comments

Comments
 (0)