ASoC: codec: wm: 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/87zg1sp8vd.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index ac1f2c850346501ce6b3ddc74197b50b2d8345b1..0f299cd07b2e945af38bafdec789a462b98dbfbf 100644 (file)
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2253,14 +2253,14 @@ static int wm5110_open(struct snd_soc_component *component,
        struct arizona *arizona = priv->core.arizona;
        int n_adsp;
 
-       if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-voicectrl") == 0) {
+       if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-voicectrl") == 0) {
                n_adsp = 2;
-       } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-trace") == 0) {
+       } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-trace") == 0) {
                n_adsp = 0;
        } 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/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 6fc34f41b1758094acb4ba653eeb1bb023712399..db847e80a9c608e0e39b3fbe3ebcdb45521a5535 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1236,22 +1236,22 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)
 
        if (wm_adsp_fw[dsp->fw].num_caps == 0) {
                adsp_err(dsp, "%s: Firmware does not support compressed API\n",
-                        asoc_rtd_to_codec(rtd, 0)->name);
+                        snd_soc_rtd_to_codec(rtd, 0)->name);
                ret = -ENXIO;
                goto out;
        }
 
        if (wm_adsp_fw[dsp->fw].compr_direction != stream->direction) {
                adsp_err(dsp, "%s: Firmware does not support stream direction\n",
-                        asoc_rtd_to_codec(rtd, 0)->name);
+                        snd_soc_rtd_to_codec(rtd, 0)->name);
                ret = -EINVAL;
                goto out;
        }
 
        list_for_each_entry(tmp, &dsp->compr_list, list) {
-               if (!strcmp(tmp->name, asoc_rtd_to_codec(rtd, 0)->name)) {
+               if (!strcmp(tmp->name, snd_soc_rtd_to_codec(rtd, 0)->name)) {
                        adsp_err(dsp, "%s: Only a single stream supported per dai\n",
-                                asoc_rtd_to_codec(rtd, 0)->name);
+                                snd_soc_rtd_to_codec(rtd, 0)->name);
                        ret = -EBUSY;
                        goto out;
                }
@@ -1265,7 +1265,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)
 
        compr->dsp = dsp;
        compr->stream = stream;
-       compr->name = asoc_rtd_to_codec(rtd, 0)->name;
+       compr->name = snd_soc_rtd_to_codec(rtd, 0)->name;
 
        list_add_tail(&compr->list, &dsp->compr_list);