ASoC: core: Make snd_soc_unregister_card() return void

The function snd_soc_unregister_card() returned 0 unconditionally and most
callers don't care to check the return value. Make it return void and
adapt the callers that didn't ignore the return value before.

This is a preparation for making platform remove callbacks return void.

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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 76ee3c2b8b56cda858e543c0feea6ff2a1642d27..aad24a1d32767a3d8a5c082afce63ca88e68c146 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -426,7 +426,7 @@ enum snd_soc_pcm_subclass {
 };
 
 int snd_soc_register_card(struct snd_soc_card *card);
-int snd_soc_unregister_card(struct snd_soc_card *card);
+void snd_soc_unregister_card(struct snd_soc_card *card);
 int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);
 #ifdef CONFIG_PM_SLEEP
 int snd_soc_suspend(struct device *dev);

diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index ce46d8a0b7e43441720e6d5306e245c8edb2a01e..954460719aa3d0b8ad225fad0470ba3acad8033e 100644 (file)
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -157,7 +157,9 @@ put_codec_node:
 
 static int snd_proto_remove(struct platform_device *pdev)
 {
-       return snd_soc_unregister_card(&snd_proto);
+       snd_soc_unregister_card(&snd_proto);
+
+       return 0;
 }
 
 static const struct of_device_id snd_proto_of_match[] = {

diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index 83b4a22bf15ac0b8883f3144c55f34d5959f6012..e4c805acc34970b05c5e0c7f39654a9c855dba02 100644 (file)
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -113,12 +113,11 @@ static int pcm030_fabric_probe(struct platform_device *op)
 static int pcm030_fabric_remove(struct platform_device *op)
 {
        struct pcm030_audio_data *pdata = platform_get_drvdata(op);
-       int ret;
 
-       ret = snd_soc_unregister_card(pdata->card);
+       snd_soc_unregister_card(pdata->card);
        platform_device_unregister(pdata->codec_device);
 
-       return ret;
+       return 0;
 }
 
 static const struct of_device_id pcm030_audio_match[] = {

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 57f7105c12b76c5b6eb0065556171cd36691424e..30f0da711ca953310544c427670a2581cbaf4b74 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2319,14 +2319,12 @@ EXPORT_SYMBOL_GPL(snd_soc_register_card);
  * @card: Card to unregister
  *
  */
-int snd_soc_unregister_card(struct snd_soc_card *card)
+void snd_soc_unregister_card(struct snd_soc_card *card)
 {
        mutex_lock(&client_mutex);
        snd_soc_unbind_card(card, true);
        mutex_unlock(&client_mutex);
        dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_card);
 

diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c
index ae3968161509cd1ca15bcacddf9070a30a391ded..225d7435597417a757fa6006e235b53b6d862fa5 100644 (file)
--- a/sound/soc/soc-topology-test.c
+++ b/sound/soc/soc-topology-test.c
@@ -271,9 +271,7 @@ static void snd_soc_tplg_test_load_with_null_comp(struct kunit *test)
        KUNIT_EXPECT_EQ(test, 0, ret);
 
        /* cleanup */
-       ret = snd_soc_unregister_card(&kunit_comp->card);
-       KUNIT_EXPECT_EQ(test, 0, ret);
-
+       snd_soc_unregister_card(&kunit_comp->card);
        snd_soc_unregister_component(test_dev);
 }