Skip to content

Commit 36e9800

Browse files
ujfalusibroonie
authored andcommitted
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: Peter Ujfalusi <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 965e49c commit 36e9800

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

sound/soc/sof/ipc4-pcm.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
721721
{
722722
struct snd_sof_pcm_stream_pipeline_list *pipeline_list;
723723
struct sof_ipc4_fw_data *ipc4_data = sdev->private;
724-
struct sof_ipc4_timestamp_info *stream_info;
724+
struct sof_ipc4_timestamp_info *time_info;
725725
bool support_info = true;
726726
u32 abi_version;
727727
u32 abi_offset;
@@ -752,13 +752,13 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
752752
if (!support_info)
753753
continue;
754754

755-
stream_info = kzalloc(sizeof(*stream_info), GFP_KERNEL);
756-
if (!stream_info) {
755+
time_info = kzalloc(sizeof(*time_info), GFP_KERNEL);
756+
if (!time_info) {
757757
sof_ipc4_pcm_free(sdev, spcm);
758758
return -ENOMEM;
759759
}
760760

761-
spcm->stream[stream].private = stream_info;
761+
spcm->stream[stream].private = time_info;
762762
}
763763

764764
return 0;
@@ -769,7 +769,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
769769
struct sof_ipc4_copier *host_copier = NULL;
770770
struct sof_ipc4_copier *dai_copier = NULL;
771771
struct sof_ipc4_llp_reading_slot llp_slot;
772-
struct sof_ipc4_timestamp_info *info;
772+
struct sof_ipc4_timestamp_info *time_info;
773773
struct snd_soc_dapm_widget *widget;
774774
struct snd_sof_dai *dai;
775775
int i;
@@ -795,44 +795,44 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
795795
return;
796796
}
797797

798-
info = sps->private;
799-
info->host_copier = host_copier;
800-
info->dai_copier = dai_copier;
801-
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_gpdma_reading_slots) +
802-
sdev->fw_info_box.offset;
798+
time_info = sps->private;
799+
time_info->host_copier = host_copier;
800+
time_info->dai_copier = dai_copier;
801+
time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
802+
llp_gpdma_reading_slots) + sdev->fw_info_box.offset;
803803

804804
/* find llp slot used by current dai */
805805
for (i = 0; i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS; i++) {
806-
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot));
806+
sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
807807
if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id)
808808
break;
809809

810-
info->llp_offset += sizeof(llp_slot);
810+
time_info->llp_offset += sizeof(llp_slot);
811811
}
812812

813813
if (i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS)
814814
return;
815815

816816
/* if no llp gpdma slot is used, check aggregated sdw slot */
817-
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_sndw_reading_slots) +
818-
sdev->fw_info_box.offset;
817+
time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
818+
llp_sndw_reading_slots) + sdev->fw_info_box.offset;
819819
for (i = 0; i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS; i++) {
820-
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot));
820+
sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
821821
if (llp_slot.node_id == dai_copier->data.gtw_cfg.node_id)
822822
break;
823823

824-
info->llp_offset += sizeof(llp_slot);
824+
time_info->llp_offset += sizeof(llp_slot);
825825
}
826826

827827
if (i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS)
828828
return;
829829

830830
/* check EVAD slot */
831-
info->llp_offset = offsetof(struct sof_ipc4_fw_registers, llp_evad_reading_slot) +
832-
sdev->fw_info_box.offset;
833-
sof_mailbox_read(sdev, info->llp_offset, &llp_slot, sizeof(llp_slot));
831+
time_info->llp_offset = offsetof(struct sof_ipc4_fw_registers,
832+
llp_evad_reading_slot) + sdev->fw_info_box.offset;
833+
sof_mailbox_read(sdev, time_info->llp_offset, &llp_slot, sizeof(llp_slot));
834834
if (llp_slot.node_id != dai_copier->data.gtw_cfg.node_id)
835-
info->llp_offset = 0;
835+
time_info->llp_offset = 0;
836836
}
837837

838838
static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component,

0 commit comments

Comments
 (0)