Commit 221a3d28 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87zg1sp8vd.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d2d1a48
...@@ -2253,14 +2253,14 @@ static int wm5110_open(struct snd_soc_component *component, ...@@ -2253,14 +2253,14 @@ static int wm5110_open(struct snd_soc_component *component,
struct arizona *arizona = priv->core.arizona; struct arizona *arizona = priv->core.arizona;
int n_adsp; 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; 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; n_adsp = 0;
} else { } else {
dev_err(arizona->dev, dev_err(arizona->dev,
"No suitable compressed stream for DAI '%s'\n", "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; return -EINVAL;
} }
......
...@@ -1236,22 +1236,22 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream) ...@@ -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) { if (wm_adsp_fw[dsp->fw].num_caps == 0) {
adsp_err(dsp, "%s: Firmware does not support compressed API\n", 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; ret = -ENXIO;
goto out; goto out;
} }
if (wm_adsp_fw[dsp->fw].compr_direction != stream->direction) { if (wm_adsp_fw[dsp->fw].compr_direction != stream->direction) {
adsp_err(dsp, "%s: Firmware does not support stream direction\n", 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; ret = -EINVAL;
goto out; goto out;
} }
list_for_each_entry(tmp, &dsp->compr_list, list) { 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", 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; ret = -EBUSY;
goto out; goto out;
} }
...@@ -1265,7 +1265,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream) ...@@ -1265,7 +1265,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)
compr->dsp = dsp; compr->dsp = dsp;
compr->stream = stream; 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); list_add_tail(&compr->list, &dsp->compr_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment