Skip to content

Commit 52b43bb

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
powercap: intel_rapl: 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> Reviewed-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 07abb19 commit 52b43bb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/powercap/intel_rapl_msr.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,10 @@ static int rapl_msr_probe(struct platform_device *pdev)
197197
return ret;
198198
}
199199

200-
static int rapl_msr_remove(struct platform_device *pdev)
200+
static void rapl_msr_remove(struct platform_device *pdev)
201201
{
202202
cpuhp_remove_state(rapl_msr_priv->pcap_rapl_online);
203203
powercap_unregister_control_type(rapl_msr_priv->control_type);
204-
return 0;
205204
}
206205

207206
static const struct platform_device_id rapl_msr_ids[] = {
@@ -212,7 +211,7 @@ MODULE_DEVICE_TABLE(platform, rapl_msr_ids);
212211

213212
static struct platform_driver intel_rapl_msr_driver = {
214213
.probe = rapl_msr_probe,
215-
.remove = rapl_msr_remove,
214+
.remove_new = rapl_msr_remove,
216215
.id_table = rapl_msr_ids,
217216
.driver = {
218217
.name = "intel_rapl_msr",

0 commit comments

Comments
 (0)