Unverified Commit 965e49cd authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-pcm: Use consistent name for snd_sof_pcm_stream pointer 



Throughout the file the pointer for snd_sof_pcm_stream is named either
'stream' or (wrongly) 'spcm' which confuses the reader.

Use 'sps' for the pointer name as it is the most common name used in SOF
codebase.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://msgid.link/r/20240409110036.9411-2-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc4-pcm.c

+11 −11
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm 
	return 0;

}



static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pcm_stream *spcm)

static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pcm_stream *sps)

{

	struct sof_ipc4_copier *host_copier = NULL;

	struct sof_ipc4_copier *dai_copier = NULL;
@@ -775,7 +775,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc 
	int i;



	/* find host & dai to locate info in memory window */

	for_each_dapm_widgets(spcm->list, i, widget) {

	for_each_dapm_widgets(sps->list, i, widget) {

		struct snd_sof_widget *swidget = widget->dobj.private;



		if (!swidget)
@@ -795,7 +795,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc 
		return;

	}



	info = spcm->private;

	info = sps->private;

	info->host_copier = host_copier;

	info->dai_copier = dai_copier;

	info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_gpdma_reading_slots) +
@@ -864,7 +864,7 @@ static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component, 


static int sof_ipc4_get_stream_start_offset(struct snd_sof_dev *sdev,

					    struct snd_pcm_substream *substream,

					    struct snd_sof_pcm_stream *stream,

					    struct snd_sof_pcm_stream *sps,

					    struct sof_ipc4_timestamp_info *time_info)

{

	struct sof_ipc4_copier *host_copier = time_info->host_copier;
@@ -918,7 +918,7 @@ static int sof_ipc4_pcm_pointer(struct snd_soc_component *component, 
	struct sof_ipc4_timestamp_info *time_info;

	struct sof_ipc4_llp_reading_slot llp;

	snd_pcm_uframes_t head_cnt, tail_cnt;

	struct snd_sof_pcm_stream *stream;

	struct snd_sof_pcm_stream *sps;

	u64 dai_cnt, host_cnt, host_ptr;

	struct snd_sof_pcm *spcm;

	int ret;
@@ -927,8 +927,8 @@ static int sof_ipc4_pcm_pointer(struct snd_soc_component *component, 
	if (!spcm)

		return -EOPNOTSUPP;



	stream = &spcm->stream[substream->stream];

	time_info = stream->private;

	sps = &spcm->stream[substream->stream];

	time_info = sps->private;

	if (!time_info)

		return -EOPNOTSUPP;
@@ -938,7 +938,7 @@ static int sof_ipc4_pcm_pointer(struct snd_soc_component *component, 
	 * the statistics is complete. And it will not change after the first initiailization.

	 */

	if (time_info->stream_start_offset == SOF_IPC4_INVALID_STREAM_POSITION) {

		ret = sof_ipc4_get_stream_start_offset(sdev, substream, stream, time_info);

		ret = sof_ipc4_get_stream_start_offset(sdev, substream, sps, time_info);

		if (ret < 0)

			return -EOPNOTSUPP;

	}
@@ -1030,15 +1030,15 @@ static snd_pcm_sframes_t sof_ipc4_pcm_delay(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_ipc4_timestamp_info *time_info;

	struct snd_sof_pcm_stream *stream;

	struct snd_sof_pcm_stream *sps;

	struct snd_sof_pcm *spcm;



	spcm = snd_sof_find_spcm_dai(component, rtd);

	if (!spcm)

		return 0;



	stream = &spcm->stream[substream->stream];

	time_info = stream->private;

	sps = &spcm->stream[substream->stream];

	time_info = sps->private;

	/*

	 * Report the stored delay value calculated in the pointer callback.

	 * In the unlikely event that the calculation was skipped/aborted, the