| Message ID | 20230326143224.572654-49-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| 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/venc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c > index cdb12546c4fa..6d61614656a5 100644 > --- a/drivers/media/platform/qcom/venus/venc.c > +++ b/drivers/media/platform/qcom/venus/venc.c > @@ -1492,7 +1492,7 @@ static int venc_probe(struct platform_device *pdev) > return ret; > } > > -static int venc_remove(struct platform_device *pdev) > +static void venc_remove(struct platform_device *pdev) > { > struct venus_core *core = dev_get_drvdata(pdev->dev.parent); > > @@ -1501,8 +1501,6 @@ static int venc_remove(struct platform_device *pdev) > > if (core->pm_ops->venc_put) > core->pm_ops->venc_put(core->dev_enc); > - > - return 0; > } > > static __maybe_unused int venc_runtime_suspend(struct device *dev) > @@ -1543,7 +1541,7 @@ MODULE_DEVICE_TABLE(of, venc_dt_match); > > static struct platform_driver qcom_venus_enc_driver = { > .probe = venc_probe, > - .remove = venc_remove, > + .remove_new = venc_remove, > .driver = { > .name = "qcom-venus-encoder", > .of_match_table = venc_dt_match,
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index cdb12546c4fa..6d61614656a5 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1492,7 +1492,7 @@ static int venc_probe(struct platform_device *pdev) return ret; } -static int venc_remove(struct platform_device *pdev) +static void venc_remove(struct platform_device *pdev) { struct venus_core *core = dev_get_drvdata(pdev->dev.parent); @@ -1501,8 +1501,6 @@ static int venc_remove(struct platform_device *pdev) if (core->pm_ops->venc_put) core->pm_ops->venc_put(core->dev_enc); - - return 0; } static __maybe_unused int venc_runtime_suspend(struct device *dev) @@ -1543,7 +1541,7 @@ MODULE_DEVICE_TABLE(of, venc_dt_match); static struct platform_driver qcom_venus_enc_driver = { .probe = venc_probe, - .remove = venc_remove, + .remove_new = venc_remove, .driver = { .name = "qcom-venus-encoder", .of_match_table = venc_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/venc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)