| Message ID | 20230504194453.1150368-10-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 52c800940612dc7ece9257922b87905c949fa492 |
| Headers | show |
| Series | remoteproc: Convert to platform remove callback returning void | expand |
On 04/05/2023 20:44, 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: Caleb Connolly <caleb.connolly@linaro.org> > --- > drivers/remoteproc/qcom_q6v5_adsp.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > index d546ab9dc141..6777a3bd6226 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -763,7 +763,7 @@ static int adsp_probe(struct platform_device *pdev) > return ret; > } > > -static int adsp_remove(struct platform_device *pdev) > +static void adsp_remove(struct platform_device *pdev) > { > struct qcom_adsp *adsp = platform_get_drvdata(pdev); > > @@ -775,8 +775,6 @@ static int adsp_remove(struct platform_device *pdev) > qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev); > qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); > rproc_free(adsp->rproc); > - > - return 0; > } > > static const struct adsp_pil_data adsp_resource_init = { > @@ -859,7 +857,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match); > > static struct platform_driver adsp_pil_driver = { > .probe = adsp_probe, > - .remove = adsp_remove, > + .remove_new = adsp_remove, > .driver = { > .name = "qcom_q6v5_adsp", > .of_match_table = adsp_of_match,
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index d546ab9dc141..6777a3bd6226 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -763,7 +763,7 @@ static int adsp_probe(struct platform_device *pdev) return ret; } -static int adsp_remove(struct platform_device *pdev) +static void adsp_remove(struct platform_device *pdev) { struct qcom_adsp *adsp = platform_get_drvdata(pdev); @@ -775,8 +775,6 @@ static int adsp_remove(struct platform_device *pdev) qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev); qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); rproc_free(adsp->rproc); - - return 0; } static const struct adsp_pil_data adsp_resource_init = { @@ -859,7 +857,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match); static struct platform_driver adsp_pil_driver = { .probe = adsp_probe, - .remove = adsp_remove, + .remove_new = adsp_remove, .driver = { .name = "qcom_q6v5_adsp", .of_match_table = adsp_of_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/remoteproc/qcom_q6v5_adsp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)