Skip to content

Commit aa59965

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: ns: 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 f29ecd3 commit aa59965

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/broadcom/ns-thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ static int ns_thermal_probe(struct platform_device *pdev)
6565
return 0;
6666
}
6767

68-
static int ns_thermal_remove(struct platform_device *pdev)
68+
static void ns_thermal_remove(struct platform_device *pdev)
6969
{
7070
void __iomem *pvtmon = platform_get_drvdata(pdev);
7171

7272
iounmap(pvtmon);
73-
74-
return 0;
7573
}
7674

7775
static const struct of_device_id ns_thermal_of_match[] = {
@@ -82,7 +80,7 @@ MODULE_DEVICE_TABLE(of, ns_thermal_of_match);
8280

8381
static struct platform_driver ns_thermal_driver = {
8482
.probe = ns_thermal_probe,
85-
.remove = ns_thermal_remove,
83+
.remove_new = ns_thermal_remove,
8684
.driver = {
8785
.name = "ns-thermal",
8886
.of_match_table = ns_thermal_of_match,

0 commit comments

Comments
 (0)