Skip to content

Commit 02e7baa

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: imx: 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 5568f64 commit 02e7baa

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/imx_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ static int imx_thermal_probe(struct platform_device *pdev)
771771
return ret;
772772
}
773773

774-
static int imx_thermal_remove(struct platform_device *pdev)
774+
static void imx_thermal_remove(struct platform_device *pdev)
775775
{
776776
struct imx_thermal_data *data = platform_get_drvdata(pdev);
777777

@@ -780,8 +780,6 @@ static int imx_thermal_remove(struct platform_device *pdev)
780780

781781
thermal_zone_device_unregister(data->tz);
782782
imx_thermal_unregister_legacy_cooling(data);
783-
784-
return 0;
785783
}
786784

787785
static int __maybe_unused imx_thermal_suspend(struct device *dev)
@@ -880,7 +878,7 @@ static struct platform_driver imx_thermal = {
880878
.of_match_table = of_imx_thermal_match,
881879
},
882880
.probe = imx_thermal_probe,
883-
.remove = imx_thermal_remove,
881+
.remove_new = imx_thermal_remove,
884882
};
885883
module_platform_driver(imx_thermal);
886884

0 commit comments

Comments
 (0)