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

ASoC: sof: intel: 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/87sf7kp8um.wl-kuninori.morimoto.gx@renesas.com


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

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

+11 −11
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static bool hda_check_fes(struct snd_soc_pcm_runtime *rtd, 
static struct hdac_ext_stream *

hda_link_stream_assign(struct hdac_bus *bus, struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_intel_hda_stream *hda_stream;

	const struct sof_intel_dsp_desc *chip;

	struct snd_sof_dev *sdev;
@@ -145,12 +145,12 @@ static struct hdac_ext_stream *hda_assign_hext_stream(struct snd_sof_dev *sdev, 
						      struct snd_soc_dai *cpu_dai,

						      struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *dai;

	struct hdac_ext_stream *hext_stream;



	/* only allocate a stream_tag for the first DAI in the dailink */

	dai = asoc_rtd_to_cpu(rtd, 0);

	dai = snd_soc_rtd_to_cpu(rtd, 0);

	if (dai == cpu_dai)

		hext_stream = hda_link_stream_assign(sof_to_bus(sdev), substream);

	else
@@ -168,11 +168,11 @@ static void hda_release_hext_stream(struct snd_sof_dev *sdev, struct snd_soc_dai 
				    struct snd_pcm_substream *substream)

{

	struct hdac_ext_stream *hext_stream = hda_get_hext_stream(sdev, cpu_dai, substream);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *dai;



	/* only release a stream_tag for the first DAI in the dailink */

	dai = asoc_rtd_to_cpu(rtd, 0);

	dai = snd_soc_rtd_to_cpu(rtd, 0);

	if (dai == cpu_dai)

		snd_hdac_ext_stream_release(hext_stream, HDAC_EXT_STREAM_TYPE_LINK);

	snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);
@@ -193,8 +193,8 @@ static void hda_codec_dai_set_stream(struct snd_sof_dev *sdev, 
				     struct snd_pcm_substream *substream,

				     struct hdac_stream *hstream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

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

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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



	/* set the hdac_stream in the codec dai */

	snd_soc_dai_set_stream(codec_dai, hstream, substream->stream);
@@ -204,8 +204,8 @@ static unsigned int hda_calc_stream_format(struct snd_sof_dev *sdev, 
					   struct snd_pcm_substream *substream,

					   struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

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

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	unsigned int link_bps;

	unsigned int format_val;
@@ -226,8 +226,8 @@ static unsigned int hda_calc_stream_format(struct snd_sof_dev *sdev, 
static struct hdac_ext_link *hda_get_hlink(struct snd_sof_dev *sdev,

					   struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

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

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	struct hdac_bus *bus = sof_to_bus(sdev);



	return snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);

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

+4 −4
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int __maybe_unused hda_dai_trigger(struct snd_pcm_substream *substream, i 


static int hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int stream = substream->stream;



	return hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, dai);
@@ -408,7 +408,7 @@ static int non_hda_dai_hw_params(struct snd_pcm_substream *substream, 
static int non_hda_dai_prepare(struct snd_pcm_substream *substream,

			       struct snd_soc_dai *cpu_dai)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int stream = substream->stream;



	return non_hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, cpu_dai);
@@ -526,8 +526,8 @@ static int hda_dai_suspend(struct hdac_bus *bus) 
			struct snd_sof_dev *sdev;

			struct snd_sof_dai *sdai;



			rtd = asoc_substream_to_rtd(hext_stream->link_substream);

			cpu_dai = asoc_rtd_to_cpu(rtd, 0);

			rtd = snd_soc_substream_to_rtd(hext_stream->link_substream);

			cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

			w = snd_soc_dai_get_widget(cpu_dai, hdac_stream(hext_stream)->direction);

			swidget = w->dobj.private;

			sdev = widget_to_sdev(w);

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

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int hda_dsp_pcm_trigger(struct snd_sof_dev *sdev, 
snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev,

				      struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *scomp = sdev->component;

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
@@ -208,7 +208,7 @@ snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev, 
int hda_dsp_pcm_open(struct snd_sof_dev *sdev,

		     struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_component *scomp = sdev->component;

	struct hdac_ext_stream *dsp_stream;

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static char *hda_hstream_dbg_get_stream_info_str(struct hdac_stream *hstream) 
	struct snd_soc_pcm_runtime *rtd;



	if (hstream->substream)

		rtd = asoc_substream_to_rtd(hstream->substream);

		rtd = snd_soc_substream_to_rtd(hstream->substream);

	else if (hstream->cstream)

		rtd = hstream->cstream->private_data;

	else