mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
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 <Vijendar.Mukunda@amd.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://patch.msgid.link/20240913090631.1834543-2-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
49b2597a9e
commit
f5c05fd7e9
@ -617,7 +617,7 @@ static const struct snd_soc_ops sdw_ops = {
|
||||
.shutdown = asoc_sdw_shutdown,
|
||||
};
|
||||
|
||||
struct sof_sdw_endpoint {
|
||||
struct asoc_sdw_endpoint {
|
||||
struct list_head list;
|
||||
|
||||
u32 link_mask;
|
||||
@ -629,7 +629,7 @@ struct sof_sdw_endpoint {
|
||||
const struct asoc_sdw_dai_info *dai_info;
|
||||
};
|
||||
|
||||
struct sof_sdw_dailink {
|
||||
struct asoc_sdw_dailink {
|
||||
bool initialised;
|
||||
|
||||
u8 group_id;
|
||||
@ -660,8 +660,8 @@ static int count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *nu
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct sof_sdw_dailink *find_dailink(struct sof_sdw_dailink *dailinks,
|
||||
const struct snd_soc_acpi_endpoint *new)
|
||||
static struct asoc_sdw_dailink *find_dailink(struct asoc_sdw_dailink *dailinks,
|
||||
const struct snd_soc_acpi_endpoint *new)
|
||||
{
|
||||
while (dailinks->initialised) {
|
||||
if (new->aggregated && dailinks->group_id == new->group_id)
|
||||
@ -678,8 +678,8 @@ static struct sof_sdw_dailink *find_dailink(struct sof_sdw_dailink *dailinks,
|
||||
}
|
||||
|
||||
static int parse_sdw_endpoints(struct snd_soc_card *card,
|
||||
struct sof_sdw_dailink *sof_dais,
|
||||
struct sof_sdw_endpoint *sof_ends,
|
||||
struct asoc_sdw_dailink *sof_dais,
|
||||
struct asoc_sdw_endpoint *sof_ends,
|
||||
int *num_devs)
|
||||
{
|
||||
struct device *dev = card->dev;
|
||||
@ -687,7 +687,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
|
||||
struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);
|
||||
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
|
||||
const struct snd_soc_acpi_link_adr *adr_link;
|
||||
struct sof_sdw_endpoint *sof_end = sof_ends;
|
||||
struct asoc_sdw_endpoint *sof_end = sof_ends;
|
||||
int num_dais = 0;
|
||||
int i, j;
|
||||
int ret;
|
||||
@ -738,7 +738,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
|
||||
for (j = 0; j < adr_dev->num_endpoints; j++) {
|
||||
const struct snd_soc_acpi_endpoint *adr_end;
|
||||
const struct asoc_sdw_dai_info *dai_info;
|
||||
struct sof_sdw_dailink *sof_dai;
|
||||
struct asoc_sdw_dailink *sof_dai;
|
||||
int stream;
|
||||
|
||||
adr_end = &adr_dev->endpoints[j];
|
||||
@ -799,14 +799,14 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
|
||||
}
|
||||
|
||||
static int create_sdw_dailink(struct snd_soc_card *card,
|
||||
struct sof_sdw_dailink *sof_dai,
|
||||
struct asoc_sdw_dailink *sof_dai,
|
||||
struct snd_soc_dai_link **dai_links,
|
||||
int *be_id, struct snd_soc_codec_conf **codec_conf)
|
||||
{
|
||||
struct device *dev = card->dev;
|
||||
struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
|
||||
struct intel_mc_ctx *intel_ctx = (struct intel_mc_ctx *)ctx->private;
|
||||
struct sof_sdw_endpoint *sof_end;
|
||||
struct asoc_sdw_endpoint *sof_end;
|
||||
int stream;
|
||||
int ret;
|
||||
|
||||
@ -845,7 +845,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
|
||||
continue;
|
||||
|
||||
sof_end = list_first_entry(&sof_dai->endpoints,
|
||||
struct sof_sdw_endpoint, list);
|
||||
struct asoc_sdw_endpoint, list);
|
||||
|
||||
*be_id = sof_end->dai_info->dailink[stream];
|
||||
if (*be_id < 0) {
|
||||
@ -936,7 +936,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
|
||||
|
||||
static int create_sdw_dailinks(struct snd_soc_card *card,
|
||||
struct snd_soc_dai_link **dai_links, int *be_id,
|
||||
struct sof_sdw_dailink *sof_dais,
|
||||
struct asoc_sdw_dailink *sof_dais,
|
||||
struct snd_soc_codec_conf **codec_conf)
|
||||
{
|
||||
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)
|
||||
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
|
||||
struct snd_soc_codec_conf *codec_conf;
|
||||
struct asoc_sdw_codec_info *ssp_info;
|
||||
struct sof_sdw_endpoint *sof_ends;
|
||||
struct sof_sdw_dailink *sof_dais;
|
||||
struct asoc_sdw_endpoint *sof_ends;
|
||||
struct asoc_sdw_dailink *sof_dais;
|
||||
int num_devs = 0;
|
||||
int num_ends = 0;
|
||||
struct snd_soc_dai_link *dai_links;
|
||||
|
Loading…
Reference in New Issue
Block a user