Commit 79dc1570 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Will Deacon

perf: arm_cspmu: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/9ff5a467569dd51b2fc44e11594ad5db7ea15f57.1702648125.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent 3909cb3b
...@@ -1252,14 +1252,12 @@ static int arm_cspmu_device_probe(struct platform_device *pdev) ...@@ -1252,14 +1252,12 @@ static int arm_cspmu_device_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int arm_cspmu_device_remove(struct platform_device *pdev) static void arm_cspmu_device_remove(struct platform_device *pdev)
{ {
struct arm_cspmu *cspmu = platform_get_drvdata(pdev); struct arm_cspmu *cspmu = platform_get_drvdata(pdev);
perf_pmu_unregister(&cspmu->pmu); perf_pmu_unregister(&cspmu->pmu);
cpuhp_state_remove_instance(arm_cspmu_cpuhp_state, &cspmu->cpuhp_node); cpuhp_state_remove_instance(arm_cspmu_cpuhp_state, &cspmu->cpuhp_node);
return 0;
} }
static const struct platform_device_id arm_cspmu_id[] = { static const struct platform_device_id arm_cspmu_id[] = {
...@@ -1274,7 +1272,7 @@ static struct platform_driver arm_cspmu_driver = { ...@@ -1274,7 +1272,7 @@ static struct platform_driver arm_cspmu_driver = {
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },
.probe = arm_cspmu_device_probe, .probe = arm_cspmu_device_probe,
.remove = arm_cspmu_device_remove, .remove_new = arm_cspmu_device_remove,
.id_table = arm_cspmu_id, .id_table = arm_cspmu_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment