mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 11:55:37 +00:00
Code Issues Releases Wiki Activity

ASoC: Intel: avs-rt5682: remove redundant dapm routes

Browse source 
Two routes "AIF1 Playback<-sspX Tx" and "sspX Rx<-AIF1 Capture" are
created by snd_soc_dapm_connect_dai_link_widgets() automatically.
Remove the duplicate routes.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20230612110958.592674-12-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brent Lu 2023-06-12 19:09:57 +08:00 committed by Mark Brown
parent eae0655316
commit 96b5452fe4
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sound/soc/intel/avs/boards/rt5682.c
View file

@ -234,38 +234,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
return 0;
}
static int avs_create_dapm_routes(struct device *dev, int ssp_port,
struct snd_soc_dapm_route **routes, int *num_routes)
{
struct snd_soc_dapm_route *dr;
const int num_base = ARRAY_SIZE(card_base_routes);
const int num_dr = num_base + 2;
int idx;
dr = devm_kcalloc(dev, num_dr, sizeof(*dr), GFP_KERNEL);
if (!dr)
return -ENOMEM;
memcpy(dr, card_base_routes, num_base * sizeof(*dr));
idx = num_base;
dr[idx].sink = devm_kasprintf(dev, GFP_KERNEL, "AIF1 Playback");
dr[idx].source = devm_kasprintf(dev, GFP_KERNEL, "ssp%d Tx", ssp_port);
if (!dr[idx].sink || !dr[idx].source)
return -ENOMEM;
idx++;
dr[idx].sink = devm_kasprintf(dev, GFP_KERNEL, "ssp%d Rx", ssp_port);
dr[idx].source = devm_kasprintf(dev, GFP_KERNEL, "AIF1 Capture");
if (!dr[idx].sink || !dr[idx].source)
return -ENOMEM;
*routes = dr;
*num_routes = num_dr;
return 0;
}
static int avs_card_suspend_pre(struct snd_soc_card *card)
{
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, AVS_RT5682_CODEC_DAI_NAME);
@ -283,14 +251,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)
static int avs_rt5682_probe(struct platform_device *pdev)
{
struct snd_soc_dapm_route *routes;
struct snd_soc_dai_link *dai_link;
struct snd_soc_acpi_mach *mach;
struct snd_soc_card *card;
struct snd_soc_jack *jack;
struct device *dev = &pdev->dev;
const char *pname;
int num_routes, ssp_port, ret;
int ssp_port, ret;
if (pdev->id_entry && pdev->id_entry->driver_data)
avs_rt5682_quirk = (unsigned long)pdev->id_entry->driver_data;
@ -308,12 +275,6 @@ static int avs_rt5682_probe(struct platform_device *pdev)
return ret;
}
ret = avs_create_dapm_routes(dev, ssp_port, &routes, &num_routes);
if (ret) {
dev_err(dev, "Failed to create dapm routes: %d", ret);
return ret;
}
jack = devm_kzalloc(dev, sizeof(*jack), GFP_KERNEL);
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
if (!jack || !card)
@ -330,8 +291,8 @@ static int avs_rt5682_probe(struct platform_device *pdev)
card->num_controls = ARRAY_SIZE(card_controls);
card->dapm_widgets = card_widgets;
card->num_dapm_widgets = ARRAY_SIZE(card_widgets);
card->dapm_routes = routes;
card->num_dapm_routes = num_routes;
card->dapm_routes = card_base_routes;
card->num_dapm_routes = ARRAY_SIZE(card_base_routes);
card->fully_routed = true;
snd_soc_card_set_drvdata(card, jack);