mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
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>
This commit is contained in:
parent
4cfa9963fa
commit
a62886e3e7
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user