Unverified Commit caf7ad84 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-dai: move hda_dai_prepare() code 



Before we change the Kconfig support, move code around. No
functionality change with this commit in isolation.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230512181702.117483-7-pierre-louis.bossart@linux.intel.com


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

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

+8 −8
Original line number Diff line number Diff line
@@ -259,14 +259,6 @@ static int hda_dai_hw_params(struct snd_pcm_substream *substream, 
	return hda_dai_config(w, flags, &data);

}



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);

	int stream = substream->stream;



	return hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, dai);

}



/*

 * In contrast to IPC3, the dai trigger in IPC4 mixes pipeline state changes

 * (over IPC channel) and DMA state change (direct host register changes).
@@ -325,6 +317,14 @@ static int hda_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct 
	return 0;

}



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);

	int stream = substream->stream;



	return hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, dai);

}



static const struct snd_soc_dai_ops hda_dai_ops = {

	.hw_params = hda_dai_hw_params,

	.hw_free = hda_dai_hw_free,