ASoC: simple-card-utils: Make simple_util_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.

simple_util_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>
Reviewed-by: Herve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231013221945.1489203-13-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 18e7a0b8939551aa9dee84a5158f563eb5962445..e5da10b4c43b1fe23e2d44c6512b5352cd8cf37f 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -188,7 +188,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv,
                                char *prefix);
 int simple_util_init_priv(struct simple_util_priv *priv,
                               struct link_info *li);
-int simple_util_remove(struct platform_device *pdev);
+void simple_util_remove(struct platform_device *pdev);
 
 int graph_util_card_probe(struct snd_soc_card *card);
 int graph_util_is_ports0(struct device_node *port);

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 704f32bda24da415847de51002d1d4b3348a061e..76a9f1e8cdd557edae773d8aa8fb583e1cd642f7 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -644,7 +644,7 @@ static struct platform_driver graph_card = {
                .of_match_table = graph_of_match,
        },
        .probe = graph_probe,
-       .remove = simple_util_remove,
+       .remove_new = simple_util_remove,
 };
 module_platform_driver(graph_card);
 

diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.c b/sound/soc/generic/audio-graph-card2-custom-sample.c
index 4dc65e249ecbe7d076dbc9658d38f00602efe09e..1b6ccd2de9647b5465b1d629815a15b8d212c8c9 100644 (file)
--- a/sound/soc/generic/audio-graph-card2-custom-sample.c
+++ b/sound/soc/generic/audio-graph-card2-custom-sample.c
@@ -176,7 +176,7 @@ static struct platform_driver custom_card = {
                .of_match_table = custom_of_match,
        },
        .probe  = custom_probe,
-       .remove = simple_util_remove,
+       .remove_new = simple_util_remove,
 };
 module_platform_driver(custom_card);
 

diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 1344e1adfc6784dff1912e8b4cf55d6a1ae91213..7146611df73083ba4ffc4b206bccb744998642a2 100644 (file)
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -1224,7 +1224,7 @@ static struct platform_driver graph_card = {
                .of_match_table = graph_of_match,
        },
        .probe  = graph_probe,
-       .remove = simple_util_remove,
+       .remove_new = simple_util_remove,
 };
 module_platform_driver(graph_card);
 

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 11f186ea662a629903bb4a1eff174d3f46509aa4..cfa70a56ff0f004453cd104daac2bec2305ab440 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -958,13 +958,11 @@ int simple_util_init_priv(struct simple_util_priv *priv,
 }
 EXPORT_SYMBOL_GPL(simple_util_init_priv);
 
-int simple_util_remove(struct platform_device *pdev)
+void simple_util_remove(struct platform_device *pdev)
 {
        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
        simple_util_clean_reference(card);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(simple_util_remove);
 

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 048357ae7ae6d89a63a0a5a5a4046e077642b8d7..9c79ff6a568f025b21eaf01e48742ee043d529f3 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -827,7 +827,7 @@ static struct platform_driver simple_card = {
                .of_match_table = simple_of_match,
        },
        .probe = simple_probe,
-       .remove = simple_util_remove,
+       .remove_new = simple_util_remove,
 };
 
 module_platform_driver(simple_card);

diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
index 8b48813c2c595b1de87aaac2a93f1efe1c919c47..feba9d42bbc50d0083c3f4994964064f73042cb7 100644 (file)
--- a/sound/soc/tegra/tegra_audio_graph_card.c
+++ b/sound/soc/tegra/tegra_audio_graph_card.c
@@ -248,7 +248,7 @@ static struct platform_driver tegra_audio_graph_card = {
                .of_match_table = graph_of_tegra_match,
        },
        .probe = tegra_audio_graph_probe,
-       .remove = simple_util_remove,
+       .remove_new = simple_util_remove,
 };
 module_platform_driver(tegra_audio_graph_card);