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 51d650b..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)
@@ -343,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)