ASoC: codec: cs47lxx: convert not to use asoc_xxx()

ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wmwwp8v3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c
index 1245e1a4f2a57254f7ae566f6ad9225415db4305..ab6e7cd99733b26518835b1cd25e3ac29817278f 100644 (file)
--- a/sound/soc/codecs/cs47l15.c
+++ b/sound/soc/codecs/cs47l15.c
@@ -1246,12 +1246,12 @@ static int cs47l15_open(struct snd_soc_component *component,
        struct madera *madera = priv->madera;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) {
                n_adsp = 0;
        } else {
                dev_err(madera->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }
 

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index cfa1d34f6ebd8db818d48ecea708f7d71b0b173b..ec405ef66a8e24c2e7d473e7078e22b9ec9a8449 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1080,14 +1080,14 @@ static int cs47l24_open(struct snd_soc_component *component,
        struct arizona *arizona = priv->core.arizona;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-voicectrl") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-voicectrl") == 0) {
                n_adsp = 2;
-       } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-trace") == 0) {
+       } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-trace") == 0) {
                n_adsp = 1;
        } else {
                dev_err(arizona->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }
 

diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c
index a953f2ede1eed8e46b98b76c50d89a9bef8cd5d2..0d7ee7ea6257d18134dd11c1a47c87318232ccf8 100644 (file)
--- a/sound/soc/codecs/cs47l35.c
+++ b/sound/soc/codecs/cs47l35.c
@@ -1510,14 +1510,14 @@ static int cs47l35_open(struct snd_soc_component *component,
        struct madera *madera = priv->madera;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-voicectrl") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-voicectrl") == 0) {
                n_adsp = 2;
-       } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-trace") == 0) {
+       } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-trace") == 0) {
                n_adsp = 0;
        } else {
                dev_err(madera->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }
 

diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c
index 8276854818595946e19ea752df88f0e5effdaf9d..2dfb867e6eddba8ad24324f27aa5580a4faa8261 100644 (file)
--- a/sound/soc/codecs/cs47l85.c
+++ b/sound/soc/codecs/cs47l85.c
@@ -2452,14 +2452,14 @@ static int cs47l85_open(struct snd_soc_component *component,
        struct madera *madera = priv->madera;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-voicectrl") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-voicectrl") == 0) {
                n_adsp = 5;
-       } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-trace") == 0) {
+       } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-trace") == 0) {
                n_adsp = 0;
        } else {
                dev_err(madera->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }
 

diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c
index 2c9a5372cf51b80dfdbdac0fbc3c2cf432bdabb1..2549cb1fc121d1e2476c840b8455d443e60d5f75 100644 (file)
--- a/sound/soc/codecs/cs47l90.c
+++ b/sound/soc/codecs/cs47l90.c
@@ -2371,14 +2371,14 @@ static int cs47l90_open(struct snd_soc_component *component,
        struct madera *madera = priv->madera;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-voicectrl") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-voicectrl") == 0) {
                n_adsp = 5;
-       } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-trace") == 0) {
+       } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-trace") == 0) {
                n_adsp = 0;
        } else {
                dev_err(madera->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }
 

diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index 352deeaff1ca9f817ff180868818bac32421dccb..0c05ae0b09fb2e545460953b3c3b5aaa2bef4be6 100644 (file)
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1850,12 +1850,12 @@ static int cs47l92_open(struct snd_soc_component *component,
        struct madera *madera = priv->madera;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l92-dsp-trace") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l92-dsp-trace") == 0) {
                n_adsp = 0;
        } else {
                dev_err(madera->dev,
                        "No suitable compressed stream for DAI '%s'\n",
-                       asoc_rtd_to_codec(rtd, 0)->name);
+                       snd_soc_rtd_to_codec(rtd, 0)->name);
                return -EINVAL;
        }