ASoC: xilinx: Migrate to new style legacy DAI naming flag

Change the legacy DAI naming flag from opting in to the new scheme
(non_legacy_dai_naming), to opting out of it (legacy_dai_naming).
These drivers appear to be on the CPU side of the DAI link and
currently uses the legacy naming, so add the new flag.

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

diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c
index 5c4158069a5a893ebf7cfec6d7a6249c353c68df..f5ac0aa312d6ed932779bfdf4895e0cb5eb570d2 100644 (file)
--- a/sound/soc/xilinx/xlnx_formatter_pcm.c
+++ b/sound/soc/xilinx/xlnx_formatter_pcm.c
@@ -575,14 +575,14 @@ static int xlnx_formatter_pcm_new(struct snd_soc_component *component,
 }
 
 static const struct snd_soc_component_driver xlnx_asoc_component = {
-       .name           = DRV_NAME,
-       .set_sysclk     = xlnx_formatter_set_sysclk,
-       .open           = xlnx_formatter_pcm_open,
-       .close          = xlnx_formatter_pcm_close,
-       .hw_params      = xlnx_formatter_pcm_hw_params,
-       .trigger        = xlnx_formatter_pcm_trigger,
-       .pointer        = xlnx_formatter_pcm_pointer,
-       .pcm_construct  = xlnx_formatter_pcm_new,
+       .name                   = DRV_NAME,
+       .set_sysclk             = xlnx_formatter_set_sysclk,
+       .open                   = xlnx_formatter_pcm_open,
+       .close                  = xlnx_formatter_pcm_close,
+       .hw_params              = xlnx_formatter_pcm_hw_params,
+       .trigger                = xlnx_formatter_pcm_trigger,
+       .pointer                = xlnx_formatter_pcm_pointer,
+       .pcm_construct          = xlnx_formatter_pcm_new,
 };
 
 static int xlnx_formatter_pcm_probe(struct platform_device *pdev)

diff --git a/sound/soc/xilinx/xlnx_i2s.c b/sound/soc/xilinx/xlnx_i2s.c
index 4cc6ee7c81a321dd91c9ddd3af29eef77e57046f..9de92d35e30ee352dc6f3ecd703fd24749ab7414 100644 (file)
--- a/sound/soc/xilinx/xlnx_i2s.c
+++ b/sound/soc/xilinx/xlnx_i2s.c
@@ -158,6 +158,7 @@ static const struct snd_soc_dai_ops xlnx_i2s_dai_ops = {
 
 static const struct snd_soc_component_driver xlnx_i2s_component = {
        .name = DRV_NAME,
+       .legacy_dai_naming = 1,
 };
 
 static const struct of_device_id xlnx_i2s_of_match[] = {

diff --git a/sound/soc/xilinx/xlnx_spdif.c b/sound/soc/xilinx/xlnx_spdif.c
index cba0e868a7d77e35e8c80fe47bb8dea45bc9630d..7342048e98751c174982c32d55e3ec6f2fc64268 100644 (file)
--- a/sound/soc/xilinx/xlnx_spdif.c
+++ b/sound/soc/xilinx/xlnx_spdif.c
@@ -226,6 +226,7 @@ static struct snd_soc_dai_driver xlnx_spdif_rx_dai = {
 
 static const struct snd_soc_component_driver xlnx_spdif_component = {
        .name = "xlnx-spdif",
+       .legacy_dai_naming = 1,
 };
 
 static const struct of_device_id xlnx_spdif_of_match[] = {