ASoC: qcom: lpass: Make asoc_qcom_lpass_cpu_platform_remove() return 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 (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.

asoc_qcom_lpass_cpu_platform_remove() returned zero unconditionally.
Make it return void instead and convert all users to struct
platform_device::remove_new().

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20231013221945.1489203-15-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 8ce75b442b6451682897b7c96b428c96f9b4042b..8e58e814a95f63bfe37aa44694898728ce3a5726 100644 (file)
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -300,7 +300,7 @@ static struct platform_driver apq8016_lpass_cpu_platform_driver = {
                .of_match_table = of_match_ptr(apq8016_lpass_cpu_device_id),
        },
        .probe  = asoc_qcom_lpass_cpu_platform_probe,
-       .remove = asoc_qcom_lpass_cpu_platform_remove,
+       .remove_new = asoc_qcom_lpass_cpu_platform_remove,
 };
 module_platform_driver(apq8016_lpass_cpu_platform_driver);
 

diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index ba8fa7919884571229e4071411ad9b9883683f53..88b80ed45c661061b87601010c295dca4ececbd7 100644 (file)
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -1274,15 +1274,12 @@ err:
 }
 EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_platform_probe);
 
-int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev)
+void asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev)
 {
        struct lpass_data *drvdata = platform_get_drvdata(pdev);
 
        if (drvdata->variant->exit)
                drvdata->variant->exit(pdev);
-
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_platform_remove);
 

diff --git a/sound/soc/qcom/lpass-ipq806x.c b/sound/soc/qcom/lpass-ipq806x.c
index bbe9f11d7780a66d246ca9b98a36c8d5d8209b82..e0e9ad35821c75864114ebe27240be42e7dcb6d5 100644 (file)
--- a/sound/soc/qcom/lpass-ipq806x.c
+++ b/sound/soc/qcom/lpass-ipq806x.c
@@ -172,7 +172,7 @@ static struct platform_driver ipq806x_lpass_cpu_platform_driver = {
                .of_match_table = of_match_ptr(ipq806x_lpass_cpu_device_id),
        },
        .probe  = asoc_qcom_lpass_cpu_platform_probe,
-       .remove = asoc_qcom_lpass_cpu_platform_remove,
+       .remove_new = asoc_qcom_lpass_cpu_platform_remove,
 };
 module_platform_driver(ipq806x_lpass_cpu_platform_driver);
 

diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c
index 1b0c04b210cede4b6313cf9db840c940dcaba4b2..22063b83455409e2040a80dd430b37cc3fd9f914 100644 (file)
--- a/sound/soc/qcom/lpass-sc7180.c
+++ b/sound/soc/qcom/lpass-sc7180.c
@@ -315,7 +315,7 @@ static struct platform_driver sc7180_lpass_cpu_platform_driver = {
                .pm = &sc7180_lpass_pm_ops,
        },
        .probe = asoc_qcom_lpass_cpu_platform_probe,
-       .remove = asoc_qcom_lpass_cpu_platform_remove,
+       .remove_new = asoc_qcom_lpass_cpu_platform_remove,
        .shutdown = asoc_qcom_lpass_cpu_platform_shutdown,
 };
 

diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c
index 7cd3e291382a8439a2b03a80315298ebdd6d6336..47c622327a8d3f3d04cabee53873dd0324cba4b0 100644 (file)
--- a/sound/soc/qcom/lpass-sc7280.c
+++ b/sound/soc/qcom/lpass-sc7280.c
@@ -445,7 +445,7 @@ static struct platform_driver sc7280_lpass_cpu_platform_driver = {
                .pm = &sc7280_lpass_pm_ops,
        },
        .probe = asoc_qcom_lpass_cpu_platform_probe,
-       .remove = asoc_qcom_lpass_cpu_platform_remove,
+       .remove_new = asoc_qcom_lpass_cpu_platform_remove,
        .shutdown = asoc_qcom_lpass_cpu_platform_shutdown,
 };
 

diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h
index aab60540563a9242ec5349134eee9407867931d1..2f222bd4ffcca3da0f83d0948ec063abe3b5f479 100644 (file)
--- a/sound/soc/qcom/lpass.h
+++ b/sound/soc/qcom/lpass.h
@@ -399,7 +399,7 @@ struct lpass_pcm_data {
 
 /* register the platform driver from the CPU DAI driver */
 int asoc_qcom_lpass_platform_register(struct platform_device *);
-int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev);
+void asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev);
 void asoc_qcom_lpass_cpu_platform_shutdown(struct platform_device *pdev);
 int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev);
 extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops;