| Message ID | 20230326143224.572654-47-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 9283f534ea2e22847a643d6fd874eae79e502a68 |
| Headers | show |
| Series | media: Convert to platform remove callback returning void | expand |
On 26.03.2023 16:31, Uwe Kleine-König wrote: > 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 (mostly) ignored > 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. > > 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: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/media/platform/qcom/venus/core.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 403ffb92af60..2ae867cb4c48 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -416,7 +416,7 @@ static int venus_probe(struct platform_device *pdev) > return ret; > } > > -static int venus_remove(struct platform_device *pdev) > +static void venus_remove(struct platform_device *pdev) > { > struct venus_core *core = platform_get_drvdata(pdev); > const struct venus_pm_ops *pm_ops = core->pm_ops; > @@ -447,8 +447,6 @@ static int venus_remove(struct platform_device *pdev) > mutex_destroy(&core->pm_lock); > mutex_destroy(&core->lock); > venus_dbgfs_deinit(core); > - > - return 0; > } > > static void venus_core_shutdown(struct platform_device *pdev) > @@ -891,7 +889,7 @@ MODULE_DEVICE_TABLE(of, venus_dt_match); > > static struct platform_driver qcom_venus_driver = { > .probe = venus_probe, > - .remove = venus_remove, > + .remove_new = venus_remove, > .driver = { > .name = "qcom-venus", > .of_match_table = venus_dt_match,
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 403ffb92af60..2ae867cb4c48 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -416,7 +416,7 @@ static int venus_probe(struct platform_device *pdev) return ret; } -static int venus_remove(struct platform_device *pdev) +static void venus_remove(struct platform_device *pdev) { struct venus_core *core = platform_get_drvdata(pdev); const struct venus_pm_ops *pm_ops = core->pm_ops; @@ -447,8 +447,6 @@ static int venus_remove(struct platform_device *pdev) mutex_destroy(&core->pm_lock); mutex_destroy(&core->lock); venus_dbgfs_deinit(core); - - return 0; } static void venus_core_shutdown(struct platform_device *pdev) @@ -891,7 +889,7 @@ MODULE_DEVICE_TABLE(of, venus_dt_match); static struct platform_driver qcom_venus_driver = { .probe = venus_probe, - .remove = venus_remove, + .remove_new = venus_remove, .driver = { .name = "qcom-venus", .of_match_table = venus_dt_match,
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 (mostly) ignored 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. 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> --- drivers/media/platform/qcom/venus/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)