Skip to content

Commit f5c05fd

Browse files
vijendarmukundabroonie
authored andcommitted
ASoC: intel: sof_sdw: rename soundwire endpoint and dailink structures
Rename SoundWire endpoint and dai link structures with asoc tag to make it generic. Signed-off-by: Vijendar Mukunda <[email protected]> Reviewed-by: Bard Liao <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 49b2597 commit f5c05fd

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

sound/soc/intel/boards/sof_sdw.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ static const struct snd_soc_ops sdw_ops = {
617617
.shutdown = asoc_sdw_shutdown,
618618
};
619619

620-
struct sof_sdw_endpoint {
620+
struct asoc_sdw_endpoint {
621621
struct list_head list;
622622

623623
u32 link_mask;
@@ -629,7 +629,7 @@ struct sof_sdw_endpoint {
629629
const struct asoc_sdw_dai_info *dai_info;
630630
};
631631

632-
struct sof_sdw_dailink {
632+
struct asoc_sdw_dailink {
633633
bool initialised;
634634

635635
u8 group_id;
@@ -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 sof_sdw_dailink *find_dailink(struct sof_sdw_dailink *dailinks,
664-
const struct snd_soc_acpi_endpoint *new)
663+
static struct asoc_sdw_dailink *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)
@@ -678,16 +678,16 @@ static struct sof_sdw_dailink *find_dailink(struct sof_sdw_dailink *dailinks,
678678
}
679679

680680
static int parse_sdw_endpoints(struct snd_soc_card *card,
681-
struct sof_sdw_dailink *sof_dais,
682-
struct sof_sdw_endpoint *sof_ends,
681+
struct asoc_sdw_dailink *sof_dais,
682+
struct asoc_sdw_endpoint *sof_ends,
683683
int *num_devs)
684684
{
685685
struct device *dev = card->dev;
686686
struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
687687
struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);
688688
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
689689
const struct snd_soc_acpi_link_adr *adr_link;
690-
struct sof_sdw_endpoint *sof_end = sof_ends;
690+
struct asoc_sdw_endpoint *sof_end = sof_ends;
691691
int num_dais = 0;
692692
int i, j;
693693
int ret;
@@ -738,7 +738,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
738738
for (j = 0; j < adr_dev->num_endpoints; j++) {
739739
const struct snd_soc_acpi_endpoint *adr_end;
740740
const struct asoc_sdw_dai_info *dai_info;
741-
struct sof_sdw_dailink *sof_dai;
741+
struct asoc_sdw_dailink *sof_dai;
742742
int stream;
743743

744744
adr_end = &adr_dev->endpoints[j];
@@ -799,14 +799,14 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
799799
}
800800

801801
static int create_sdw_dailink(struct snd_soc_card *card,
802-
struct sof_sdw_dailink *sof_dai,
802+
struct asoc_sdw_dailink *sof_dai,
803803
struct snd_soc_dai_link **dai_links,
804804
int *be_id, struct snd_soc_codec_conf **codec_conf)
805805
{
806806
struct device *dev = card->dev;
807807
struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
808808
struct intel_mc_ctx *intel_ctx = (struct intel_mc_ctx *)ctx->private;
809-
struct sof_sdw_endpoint *sof_end;
809+
struct asoc_sdw_endpoint *sof_end;
810810
int stream;
811811
int ret;
812812

@@ -845,7 +845,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
845845
continue;
846846

847847
sof_end = list_first_entry(&sof_dai->endpoints,
848-
struct sof_sdw_endpoint, list);
848+
struct asoc_sdw_endpoint, list);
849849

850850
*be_id = sof_end->dai_info->dailink[stream];
851851
if (*be_id < 0) {
@@ -936,7 +936,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
936936

937937
static int create_sdw_dailinks(struct snd_soc_card *card,
938938
struct snd_soc_dai_link **dai_links, int *be_id,
939-
struct sof_sdw_dailink *sof_dais,
939+
struct asoc_sdw_dailink *sof_dais,
940940
struct snd_soc_codec_conf **codec_conf)
941941
{
942942
struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
@@ -1104,8 +1104,8 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
11041104
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
11051105
struct snd_soc_codec_conf *codec_conf;
11061106
struct asoc_sdw_codec_info *ssp_info;
1107-
struct sof_sdw_endpoint *sof_ends;
1108-
struct sof_sdw_dailink *sof_dais;
1107+
struct asoc_sdw_endpoint *sof_ends;
1108+
struct asoc_sdw_dailink *sof_dais;
11091109
int num_devs = 0;
11101110
int num_ends = 0;
11111111
struct snd_soc_dai_link *dai_links;

0 commit comments

Comments
 (0)