@@ -640,7 +640,7 @@ struct asoc_sdw_dailink {
640640
641641static const char * const type_strings [] = {"SimpleJack" , "SmartAmp" , "SmartMic" };
642642
643- static int count_sdw_endpoints (struct snd_soc_card * card , int * num_devs , int * num_ends )
643+ static int asoc_sdw_count_sdw_endpoints (struct snd_soc_card * card , int * num_devs , int * num_ends )
644644{
645645 struct device * dev = card -> dev ;
646646 struct snd_soc_acpi_mach * mach = dev_get_platdata (dev );
@@ -660,8 +660,8 @@ static int count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *nu
660660 return 0 ;
661661}
662662
663- static struct asoc_sdw_dailink * find_dailink (struct asoc_sdw_dailink * dailinks ,
664- const struct snd_soc_acpi_endpoint * new )
663+ static struct asoc_sdw_dailink * asoc_sdw_find_dailink (struct asoc_sdw_dailink * dailinks ,
664+ const struct snd_soc_acpi_endpoint * new )
665665{
666666 while (dailinks -> initialised ) {
667667 if (new -> aggregated && dailinks -> group_id == new -> group_id )
@@ -677,10 +677,10 @@ static struct asoc_sdw_dailink *find_dailink(struct asoc_sdw_dailink *dailinks,
677677 return dailinks ;
678678}
679679
680- static int parse_sdw_endpoints (struct snd_soc_card * card ,
681- struct asoc_sdw_dailink * sof_dais ,
682- struct asoc_sdw_endpoint * sof_ends ,
683- int * num_devs )
680+ static int asoc_sdw_parse_sdw_endpoints (struct snd_soc_card * card ,
681+ struct asoc_sdw_dailink * sof_dais ,
682+ struct asoc_sdw_endpoint * sof_ends ,
683+ int * num_devs )
684684{
685685 struct device * dev = card -> dev ;
686686 struct asoc_sdw_mc_private * ctx = snd_soc_card_get_drvdata (card );
@@ -743,7 +743,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
743743
744744 adr_end = & adr_dev -> endpoints [j ];
745745 dai_info = & codec_info -> dais [adr_end -> num ];
746- sof_dai = find_dailink (sof_dais , adr_end );
746+ sof_dai = asoc_sdw_find_dailink (sof_dais , adr_end );
747747
748748 if (dai_info -> quirk && !(dai_info -> quirk & sof_sdw_quirk ))
749749 continue ;
@@ -1115,7 +1115,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
11151115 unsigned long ssp_mask ;
11161116 int ret ;
11171117
1118- ret = count_sdw_endpoints (card , & num_devs , & num_ends );
1118+ ret = asoc_sdw_count_sdw_endpoints (card , & num_devs , & num_ends );
11191119 if (ret < 0 ) {
11201120 dev_err (dev , "failed to count devices/endpoints: %d\n" , ret );
11211121 return ret ;
@@ -1133,7 +1133,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
11331133 goto err_dai ;
11341134 }
11351135
1136- ret = parse_sdw_endpoints (card , sof_dais , sof_ends , & num_devs );
1136+ ret = asoc_sdw_parse_sdw_endpoints (card , sof_dais , sof_ends , & num_devs );
11371137 if (ret < 0 )
11381138 goto err_end ;
11391139
0 commit comments