@@ -721,7 +721,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
721
721
{
722
722
struct snd_sof_pcm_stream_pipeline_list * pipeline_list ;
723
723
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 ;
725
725
bool support_info = true;
726
726
u32 abi_version ;
727
727
u32 abi_offset ;
@@ -752,13 +752,13 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
752
752
if (!support_info )
753
753
continue ;
754
754
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 ) {
757
757
sof_ipc4_pcm_free (sdev , spcm );
758
758
return - ENOMEM ;
759
759
}
760
760
761
- spcm -> stream [stream ].private = stream_info ;
761
+ spcm -> stream [stream ].private = time_info ;
762
762
}
763
763
764
764
return 0 ;
@@ -769,7 +769,7 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
769
769
struct sof_ipc4_copier * host_copier = NULL ;
770
770
struct sof_ipc4_copier * dai_copier = NULL ;
771
771
struct sof_ipc4_llp_reading_slot llp_slot ;
772
- struct sof_ipc4_timestamp_info * info ;
772
+ struct sof_ipc4_timestamp_info * time_info ;
773
773
struct snd_soc_dapm_widget * widget ;
774
774
struct snd_sof_dai * dai ;
775
775
int i ;
@@ -795,44 +795,44 @@ static void sof_ipc4_build_time_info(struct snd_sof_dev *sdev, struct snd_sof_pc
795
795
return ;
796
796
}
797
797
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 ;
803
803
804
804
/* find llp slot used by current dai */
805
805
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 ));
807
807
if (llp_slot .node_id == dai_copier -> data .gtw_cfg .node_id )
808
808
break ;
809
809
810
- info -> llp_offset += sizeof (llp_slot );
810
+ time_info -> llp_offset += sizeof (llp_slot );
811
811
}
812
812
813
813
if (i < SOF_IPC4_MAX_LLP_GPDMA_READING_SLOTS )
814
814
return ;
815
815
816
816
/* 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 ;
819
819
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 ));
821
821
if (llp_slot .node_id == dai_copier -> data .gtw_cfg .node_id )
822
822
break ;
823
823
824
- info -> llp_offset += sizeof (llp_slot );
824
+ time_info -> llp_offset += sizeof (llp_slot );
825
825
}
826
826
827
827
if (i < SOF_IPC4_MAX_LLP_SNDW_READING_SLOTS )
828
828
return ;
829
829
830
830
/* 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 ));
834
834
if (llp_slot .node_id != dai_copier -> data .gtw_cfg .node_id )
835
- info -> llp_offset = 0 ;
835
+ time_info -> llp_offset = 0 ;
836
836
}
837
837
838
838
static int sof_ipc4_pcm_hw_params (struct snd_soc_component * component ,
0 commit comments