Unverified Commit be3e8de7 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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



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


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 34a43780

sound/soc/sof/intel/hda-dai.c

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, 
	struct hdac_bus *bus = hstream->bus;

	struct hdac_ext_stream *link_dev;

	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct sof_intel_hda_stream *hda_stream;

	struct hda_pipe_params p_params = {0};

	struct hdac_ext_link *link;
@@ -293,7 +293,7 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, 
	bus = hstream->bus;

	rtd = snd_pcm_substream_chip(substream);



	link = snd_hdac_ext_bus_get_link(bus, rtd->codec_dai->component->name);

	link = snd_hdac_ext_bus_get_link(bus, asoc_rtd_to_codec(rtd, 0)->component->name);

	if (!link)

		return -EINVAL;
@@ -374,7 +374,7 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	link = snd_hdac_ext_bus_get_link(bus, rtd->codec_dai->component->name);

	link = snd_hdac_ext_bus_get_link(bus, asoc_rtd_to_codec(rtd, 0)->component->name);

	if (!link)

		return -EINVAL;

sound/soc/sof/intel/hda-dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) 
		 */

		if (stream->link_substream) {

			rtd = snd_pcm_substream_chip(stream->link_substream);

			name = rtd->codec_dai->component->name;

			name = asoc_rtd_to_codec(rtd, 0)->component->name;

			link = snd_hdac_ext_bus_get_link(bus, name);

			if (!link)

				return -EINVAL;