ASoC: sh: 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-11-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index 475fc98..46d145c 100644 (file)
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -307,7 +307,8 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = {
 };
 
 static const struct snd_soc_component_driver sh4_hac_component = {
-       .name           = "sh4-hac",
+       .name                   = "sh4-hac",
+       .legacy_dai_naming      = 1,
 };
 
 static int hac_soc_platform_probe(struct platform_device *pdev)

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index a4180dc..4973f94 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1813,11 +1813,12 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
  *             snd_soc_component
  */
 static const struct snd_soc_component_driver rsnd_soc_component = {
-       .name           = "rsnd",
-       .probe          = rsnd_debugfs_probe,
-       .hw_params      = rsnd_hw_params,
-       .hw_free        = rsnd_hw_free,
-       .pointer        = rsnd_pointer,
+       .name                   = "rsnd",
+       .probe                  = rsnd_debugfs_probe,
+       .hw_params              = rsnd_hw_params,
+       .hw_free                = rsnd_hw_free,
+       .pointer                = rsnd_pointer,
+       .legacy_dai_naming      = 1,
 };
 
 static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,

diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c
index beaf1a8..0d0594a 100644 (file)
--- a/sound/soc/sh/rz-ssi.c
+++ b/sound/soc/sh/rz-ssi.c
@@ -906,10 +906,11 @@ static struct snd_soc_dai_driver rz_ssi_soc_dai[] = {
 };
 
 static const struct snd_soc_component_driver rz_ssi_soc_component = {
-       .name           = "rz-ssi",
-       .open           = rz_ssi_pcm_open,
-       .pointer        = rz_ssi_pcm_pointer,
-       .pcm_construct  = rz_ssi_pcm_new,
+       .name                   = "rz-ssi",
+       .open                   = rz_ssi_pcm_open,
+       .pointer                = rz_ssi_pcm_pointer,
+       .pcm_construct          = rz_ssi_pcm_new,
+       .legacy_dai_naming      = 1,
 };
 
 static int rz_ssi_probe(struct platform_device *pdev)

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 0a8a3c3..f15ff36 100644 (file)
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -540,13 +540,14 @@ static void siu_pcm_free(struct snd_soc_component *component,
 }
 
 const struct snd_soc_component_driver siu_component = {
-       .name           = DRV_NAME,
-       .open           = siu_pcm_open,
-       .close          = siu_pcm_close,
-       .prepare        = siu_pcm_prepare,
-       .trigger        = siu_pcm_trigger,
-       .pointer        = siu_pcm_pointer_dma,
-       .pcm_construct  = siu_pcm_new,
-       .pcm_destruct   = siu_pcm_free,
+       .name                   = DRV_NAME,
+       .open                   = siu_pcm_open,
+       .close                  = siu_pcm_close,
+       .prepare                = siu_pcm_prepare,
+       .trigger                = siu_pcm_trigger,
+       .pointer                = siu_pcm_pointer_dma,
+       .pcm_construct          = siu_pcm_new,
+       .pcm_destruct           = siu_pcm_free,
+       .legacy_dai_naming      = 1,
 };
 EXPORT_SYMBOL_GPL(siu_component);

diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index bf7a3c6..96cf523 100644 (file)
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -377,7 +377,8 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
 };
 
 static const struct snd_soc_component_driver sh4_ssi_component = {
-       .name           = "sh4-ssi",
+       .name                   = "sh4-ssi",
+       .legacy_dai_naming      = 1,
 };
 
 static int sh4_soc_dai_probe(struct platform_device *pdev)