| Message ID | 20230326143224.572654-45-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 428bbf4be4018aefa26e4d6531779fa8925ecaaf |
| 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/camss/camss.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c > index 9cda284f1e71..df8a507ce8ac 100644 > --- a/drivers/media/platform/qcom/camss/camss.c > +++ b/drivers/media/platform/qcom/camss/camss.c > @@ -1725,7 +1725,7 @@ void camss_delete(struct camss *camss) > * > * Always returns 0. > */ > -static int camss_remove(struct platform_device *pdev) > +static void camss_remove(struct platform_device *pdev) > { > struct camss *camss = platform_get_drvdata(pdev); > > @@ -1735,8 +1735,6 @@ static int camss_remove(struct platform_device *pdev) > > if (atomic_read(&camss->ref_count) == 0) > camss_delete(camss); > - > - return 0; > } > > static const struct of_device_id camss_dt_match[] = { > @@ -1798,7 +1796,7 @@ static const struct dev_pm_ops camss_pm_ops = { > > static struct platform_driver qcom_camss_driver = { > .probe = camss_probe, > - .remove = camss_remove, > + .remove_new = camss_remove, > .driver = { > .name = "qcom-camss", > .of_match_table = camss_dt_match,
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 9cda284f1e71..df8a507ce8ac 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -1725,7 +1725,7 @@ void camss_delete(struct camss *camss) * * Always returns 0. */ -static int camss_remove(struct platform_device *pdev) +static void camss_remove(struct platform_device *pdev) { struct camss *camss = platform_get_drvdata(pdev); @@ -1735,8 +1735,6 @@ static int camss_remove(struct platform_device *pdev) if (atomic_read(&camss->ref_count) == 0) camss_delete(camss); - - return 0; } static const struct of_device_id camss_dt_match[] = { @@ -1798,7 +1796,7 @@ static const struct dev_pm_ops camss_pm_ops = { static struct platform_driver qcom_camss_driver = { .probe = camss_probe, - .remove = camss_remove, + .remove_new = camss_remove, .driver = { .name = "qcom-camss", .of_match_table = camss_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/camss/camss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)