ASoC: meson: Remove now redundant non_legacy_dai_naming flag

The ASoC core has now been changed to default to the non-legacy DAI
naming, as such drivers using the new scheme no longer need to specify
the non_legacy_dai_naming flag.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-38-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/aiu-acodec-ctrl.c b/sound/soc/meson/aiu-acodec-ctrl.c
index 3776b07..d0f0ada 100644 (file)
--- a/sound/soc/meson/aiu-acodec-ctrl.c
+++ b/sound/soc/meson/aiu-acodec-ctrl.c
@@ -192,7 +192,6 @@ static const struct snd_soc_component_driver aiu_acodec_ctrl_component = {
        .num_dapm_routes        = ARRAY_SIZE(aiu_acodec_ctrl_routes),
        .of_xlate_dai_name      = aiu_acodec_of_xlate_dai_name,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 #ifdef CONFIG_DEBUG_FS
        .debugfs_prefix         = "acodec",
 #endif

diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
index 286ac49..84c1095 100644 (file)
--- a/sound/soc/meson/aiu-codec-ctrl.c
+++ b/sound/soc/meson/aiu-codec-ctrl.c
@@ -139,7 +139,6 @@ static const struct snd_soc_component_driver aiu_hdmi_ctrl_component = {
        .num_dapm_routes        = ARRAY_SIZE(aiu_hdmi_ctrl_routes),
        .of_xlate_dai_name      = aiu_hdmi_of_xlate_dai_name,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 #ifdef CONFIG_DEBUG_FS
        .debugfs_prefix         = "hdmi",
 #endif

diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacodec.c
index 1dfee13..ddc6679 100644 (file)
--- a/sound/soc/meson/g12a-toacodec.c
+++ b/sound/soc/meson/g12a-toacodec.c
@@ -242,7 +242,6 @@ static const struct snd_soc_component_driver g12a_toacodec_component_drv = {
        .dapm_routes            = g12a_toacodec_routes,
        .num_dapm_routes        = ARRAY_SIZE(g12a_toacodec_routes),
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct snd_soc_component_driver sm1_toacodec_component_drv = {
@@ -254,7 +253,6 @@ static const struct snd_soc_component_driver sm1_toacodec_component_drv = {
        .dapm_routes            = g12a_toacodec_routes,
        .num_dapm_routes        = ARRAY_SIZE(g12a_toacodec_routes),
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config g12a_toacodec_regmap_cfg = {

diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c
index 6c99052..579a04a 100644 (file)
--- a/sound/soc/meson/g12a-tohdmitx.c
+++ b/sound/soc/meson/g12a-tohdmitx.c
@@ -226,7 +226,6 @@ static const struct snd_soc_component_driver g12a_tohdmitx_component_drv = {
        .dapm_routes            = g12a_tohdmitx_routes,
        .num_dapm_routes        = ARRAY_SIZE(g12a_tohdmitx_routes),
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config g12a_tohdmitx_regmap_cfg = {

diff --git a/sound/soc/meson/t9015.c b/sound/soc/meson/t9015.c
index a9b8c4e..9c6b4da 100644 (file)
--- a/sound/soc/meson/t9015.c
+++ b/sound/soc/meson/t9015.c
@@ -234,7 +234,6 @@ static const struct snd_soc_component_driver t9015_codec_driver = {
        .num_dapm_routes        = ARRAY_SIZE(t9015_dapm_routes),
        .suspend_bias_off       = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config t9015_regmap_config = {