Skip to content

L
linux
Commit 36e98005 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files
Options

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

The pointer to sof_ipc4_timestamp_info named most of the time as
'time_info' only to be named as 'stream_info' or 'info' in two function.

Use the consistent name of 'time_info' throughout the file.
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-3-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 965e49cd
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
sound/soc/sof/ipc4-pcm.c
View file @ 36e98005
...@@ -721,7 +721,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm ...@@ -721,7 +721,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
{ {
struct snd_sof_pcm_stream_pipeline_list *pipeline_list; struct snd_sof_pcm_stream_pipeline_list *pipeline_list;
struct sof_ipc4_fw_data *ipc4_data = sdev->private; struct sof_ipc4_fw_data *ipc4_data = sdev->private;
struct sof_ipc4_timestamp_info *stream_info; struct sof_ipc4_timestamp_info *time_info;
bool support_info = true; bool support_info = true;
u32 abi_version; u32 abi_version;
u32 abi_offset; u32 abi_offset;
...@@ -752,13 +752,13 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm ...@@ -752,13 +752,13 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
if (!support_info) if (!support_info)
continue; continue;
stream_info = kzalloc(sizeof(*stream_info), GFP_KERNEL); time_info = kzalloc(sizeof(*time_info), GFP_KERNEL);
if (!stream_info) { if (!time_info) {
sof_ipc4_pcm_free(sdev, spcm); sof_ipc4_pcm_free(sdev, spcm);
return -ENOMEM; return -ENOMEM;
} }
spcm->stream[stream].private = stream_info; spcm->stream[stream].private = time_info;
} }
return 0; return 0;
...@@ -769,7 +769,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc ...@@ -769,7 +769,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
struct sof_ipc4_copier *host_copier = NULL; struct sof_ipc4_copier *host_copier = NULL;
struct sof_ipc4_copier *dai_copier = NULL; struct sof_ipc4_copier *dai_copier = NULL;
struct sof_ipc4_llp_reading_slot llp_slot; struct sof_ipc4_llp_reading_slot llp_slot;
struct sof_ipc4_timestamp_info *info; struct sof_ipc4_timestamp_info *time_info;
struct snd_soc_dapm_widget *widget; struct snd_soc_dapm_widget *widget;
struct snd_sof_dai *dai; struct snd_sof_dai *dai;
int i; int i;
...@@ -795,44 +795,44 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc ...@@ -795,44 +795,44 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
return; return;
} }
info = sps->private; time_info = sps->private;
info->host_copier = host_copier; time_info->host_copier = host_copier;
info->dai_copier = dai_copier; time_info->dai_copier = dai_copier;
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_gpdma_reading_slots) + time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
sdev->fw_info_box.offset; llp_gpdma_reading_slots) + sdev->fw_info_box.offset;
/* find llp slot used by current dai */ /* find llp slot used by current dai */
for (i = 0; i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS; i++) { for (i = 0; i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS; i++) {
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot)); sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id) if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id)
break; break;
info->llp_offset += sizeof(llp_slot); time_info->llp_offset += sizeof(llp_slot);
} }
if (i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS) if (i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS)
return; return;
/* if no llp gpdma slot is used, check aggregated sdw slot */ /* if no llp gpdma slot is used, check aggregated sdw slot */
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_sndw_reading_slots) + time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
sdev->fw_info_box.offset; llp_sndw_reading_slots) + sdev->fw_info_box.offset;
for (i = 0; i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS; i++) { for (i = 0; i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS; i++) {
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot)); sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id) if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id)
break; break;
info->llp_offset += sizeof(llp_slot); time_info->llp_offset += sizeof(llp_slot);
} }
if (i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS) if (i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS)
return; return;
/* check EVAD slot */ /* check EVAD slot */
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_evad_reading_slot) + time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
sdev->fw_info_box.offset; llp_evad_reading_slot) + sdev->fw_info_box.offset;
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot)); sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
if (llp_slot.node_id != dai_copier->data.gtw_cfg.node_id) if (llp_slot.node_id != dai_copier->data.gtw_cfg.node_id)
info->llp_offset = 0; time_info->llp_offset = 0;
} }
static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component, static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7