Merge branch 'for-next' into for-linus

[platform/kernel/linux-starfive.git] / sound / soc / soc-topology-test.c

diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c
index ae39681..2cd3540 100644 (file)
--- a/sound/soc/soc-topology-test.c
+++ b/sound/soc/soc-topology-test.c
@@ -104,7 +104,6 @@ static const struct snd_soc_component_driver test_component = {
        .name = "sound-soc-topology-test",
        .probe = d_probe,
        .remove = d_remove,
-       .non_legacy_dai_naming = 1,
 };
 
 /* ===== TOPOLOGY TEMPLATES ================================================= */
@@ -238,7 +237,6 @@ static int d_probe_null_comp(struct snd_soc_component *component)
 static const struct snd_soc_component_driver test_component_null_comp = {
        .name = "sound-soc-topology-test",
        .probe = d_probe_null_comp,
-       .non_legacy_dai_naming = 1,
 };
 
 static void snd_soc_tplg_test_load_with_null_comp(struct kunit *test)
@@ -271,9 +269,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);
 }
 
@@ -315,8 +311,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);
 }
@@ -346,7 +341,6 @@ static int d_probe_null_fw(struct snd_soc_component *component)
 static const struct snd_soc_component_driver test_component_null_fw = {
        .name = "sound-soc-topology-test",
        .probe = d_probe_null_fw,
-       .non_legacy_dai_naming = 1,
 };
 
 static void snd_soc_tplg_test_load_with_null_fw(struct kunit *test)
@@ -379,8 +373,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);
 }
@@ -428,8 +421,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);
 }
@@ -484,8 +476,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);
 }
@@ -540,8 +531,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);
 }
@@ -596,8 +586,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);
 }
@@ -655,8 +644,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
@@ -704,8 +692,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
@@ -757,8 +744,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
@@ -806,8 +792,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 */