ASoC: topology: KUnit: Followup prototype change of snd_soc_unregister_card()

snd_soc_unregister_card() was recently converted to return void. Only
the first instance was adapted, so convert the remaining ones now to fix
building the topology test.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 1892a991886a ("ASoC: core: Make snd_soc_unregister_card() return void")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220622210629.286487-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c
index 225d743..51d650b 100644 (file)
--- a/sound/soc/soc-topology-test.c
+++ b/sound/soc/soc-topology-test.c
@@ -313,8 +313,7 @@ static void snd_soc_tplg_test_load_with_null_ops(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);
 }
@@ -377,8 +376,7 @@ static void snd_soc_tplg_test_load_with_null_fw(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);
 }
@@ -426,8 +424,7 @@ static void snd_soc_tplg_test_load_empty_tplg(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);
 }
@@ -482,8 +479,7 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_magic(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);
 }
@@ -538,8 +534,7 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_abi(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);
 }
@@ -594,8 +589,7 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_size(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);
 }
@@ -653,8 +647,7 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_payload_size(struct kunit *tes
        /* cleanup */
        snd_soc_unregister_component(test_dev);
 
-       ret = snd_soc_unregister_card(&kunit_comp->card);
-       KUNIT_EXPECT_EQ(test, 0, ret);
+       snd_soc_unregister_card(&kunit_comp->card);
 }
 
 // TEST CASE
@@ -702,8 +695,7 @@ static void snd_soc_tplg_test_load_pcm_tplg(struct kunit *test)
        snd_soc_unregister_component(test_dev);
 
        /* cleanup */
-       ret = snd_soc_unregister_card(&kunit_comp->card);
-       KUNIT_EXPECT_EQ(test, 0, ret);
+       snd_soc_unregister_card(&kunit_comp->card);
 }
 
 // TEST CASE
@@ -755,8 +747,7 @@ static void snd_soc_tplg_test_load_pcm_tplg_reload_comp(struct kunit *test)
        }
 
        /* cleanup */
-       ret = snd_soc_unregister_card(&kunit_comp->card);
-       KUNIT_EXPECT_EQ(test, 0, ret);
+       snd_soc_unregister_card(&kunit_comp->card);
 }
 
 // TEST CASE
@@ -804,8 +795,7 @@ static void snd_soc_tplg_test_load_pcm_tplg_reload_card(struct kunit *test)
                if (ret != 0 && ret != -EPROBE_DEFER)
                        KUNIT_FAIL(test, "Failed to register card");
 
-               ret = snd_soc_unregister_card(&kunit_comp->card);
-               KUNIT_EXPECT_EQ(test, 0, ret);
+               snd_soc_unregister_card(&kunit_comp->card);
        }
 
        /* cleanup */