Skip to content

Commit 4347e7d

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: armada: 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 6465e26 commit 4347e7d

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/armada_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -965,19 +965,17 @@ static int armada_thermal_probe(struct platform_device *pdev)
965965
return 0;
966966
}
967967

968-
static int armada_thermal_exit(struct platform_device *pdev)
968+
static void armada_thermal_exit(struct platform_device *pdev)
969969
{
970970
struct armada_drvdata *drvdata = platform_get_drvdata(pdev);
971971

972972
if (drvdata->type == LEGACY)
973973
thermal_zone_device_unregister(drvdata->data.tz);
974-
975-
return 0;
976974
}
977975

978976
static struct platform_driver armada_thermal_driver = {
979977
.probe = armada_thermal_probe,
980-
.remove = armada_thermal_exit,
978+
.remove_new = armada_thermal_exit,
981979
.driver = {
982980
.name = "armada_thermal",
983981
.of_match_table = armada_thermal_id_table,

0 commit comments

Comments
 (0)