Unverified Commit b5cb8558 authored Mar 23, 2020 by Kuninori Morimoto Committed by Mark Brown Mar 27, 2020

ASoC: codecs: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87wo7bhci3.wl-kuninori.morimoto.gx@renesas.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 575be883

sound/soc/codecs/cs47l15.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1239,12 +1239,12 @@ static int cs47l15_open(struct snd_compr_stream *stream)
		struct madera *madera = priv->madera;
		int n_adsp;

		if (strcmp(rtd->codec_dai->name, "cs47l15-dsp-trace") == 0) {
		if (strcmp(asoc_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",
		rtd->codec_dai->name);
		asoc_rtd_to_codec(rtd, 0)->name);
		return -EINVAL;
		}

sound/soc/codecs/cs47l24.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1076,14 +1076,14 @@ static int cs47l24_open(struct snd_compr_stream *stream)
		struct arizona *arizona = priv->core.arizona;
		int n_adsp;

		if (strcmp(rtd->codec_dai->name, "cs47l24-dsp-voicectrl") == 0) {
		if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-voicectrl") == 0) {
		n_adsp = 2;
		} else if (strcmp(rtd->codec_dai->name, "cs47l24-dsp-trace") == 0) {
		} else if (strcmp(asoc_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",
		rtd->codec_dai->name);
		asoc_rtd_to_codec(rtd, 0)->name);
		return -EINVAL;
		}

sound/soc/codecs/cs47l35.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1514,14 +1514,14 @@ static int cs47l35_open(struct snd_compr_stream *stream)
		struct madera *madera = priv->madera;
		int n_adsp;

		if (strcmp(rtd->codec_dai->name, "cs47l35-dsp-voicectrl") == 0) {
		if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-voicectrl") == 0) {
		n_adsp = 2;
		} else if (strcmp(rtd->codec_dai->name, "cs47l35-dsp-trace") == 0) {
		} else if (strcmp(asoc_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",
		rtd->codec_dai->name);
		asoc_rtd_to_codec(rtd, 0)->name);
		return -EINVAL;
		}

sound/soc/codecs/cs47l85.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2457,14 +2457,14 @@ static int cs47l85_open(struct snd_compr_stream *stream)
		struct madera *madera = priv->madera;
		int n_adsp;

		if (strcmp(rtd->codec_dai->name, "cs47l85-dsp-voicectrl") == 0) {
		if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-voicectrl") == 0) {
		n_adsp = 5;
		} else if (strcmp(rtd->codec_dai->name, "cs47l85-dsp-trace") == 0) {
		} else if (strcmp(asoc_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",
		rtd->codec_dai->name);
		asoc_rtd_to_codec(rtd, 0)->name);
		return -EINVAL;
		}

sound/soc/codecs/cs47l90.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2368,14 +2368,14 @@ static int cs47l90_open(struct snd_compr_stream *stream)
		struct madera *madera = priv->madera;
		int n_adsp;

		if (strcmp(rtd->codec_dai->name, "cs47l90-dsp-voicectrl") == 0) {
		if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-voicectrl") == 0) {
		n_adsp = 5;
		} else if (strcmp(rtd->codec_dai->name, "cs47l90-dsp-trace") == 0) {
		} else if (strcmp(asoc_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",
		rtd->codec_dai->name);
		asoc_rtd_to_codec(rtd, 0)->name);
		return -EINVAL;
		}