Commit 60c10c67 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: i2s_test: Remove redundant dapm routes 

Remove unnecessary widgets and routes as they are created by
snd_soc_dapm_connect_dai_link_widgets() automatically.

Link: https://lore.kernel.org/all/20230612110958.592674-1-brent.lu@intel.com/


Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240308090502.2136760-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3a2be3f0

sound/soc/intel/avs/boards/i2s_test.c

+0 −79
Original line number Diff line number Diff line
@@ -54,76 +54,13 @@ 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, int tdm_slot,

				  struct snd_soc_dapm_route **routes, int *num_routes)

{

	struct snd_soc_dapm_route *dr;

	const int num_dr = 2;



	dr = devm_kcalloc(dev, num_dr, sizeof(*dr), GFP_KERNEL);

	if (!dr)

		return -ENOMEM;



	dr[0].sink = devm_kasprintf(dev, GFP_KERNEL,

				    AVS_STRING_FMT("ssp", "pb", ssp_port, tdm_slot));

	dr[0].source = devm_kasprintf(dev, GFP_KERNEL,

				      AVS_STRING_FMT("ssp", " Tx", ssp_port, tdm_slot));

	if (!dr[0].sink || !dr[0].source)

		return -ENOMEM;



	dr[1].sink = devm_kasprintf(dev, GFP_KERNEL,

				    AVS_STRING_FMT("ssp", " Rx", ssp_port, tdm_slot));

	dr[1].source = devm_kasprintf(dev, GFP_KERNEL,

				      AVS_STRING_FMT("ssp", "cp", ssp_port, tdm_slot));

	if (!dr[1].sink || !dr[1].source)

		return -ENOMEM;



	*routes = dr;

	*num_routes = num_dr;



	return 0;

}



static int avs_create_dapm_widgets(struct device *dev, int ssp_port, int tdm_slot,

				   struct snd_soc_dapm_widget **widgets, int *num_widgets)

{

	struct snd_soc_dapm_widget *dw;

	const int num_dw = 2;



	dw = devm_kcalloc(dev, num_dw, sizeof(*dw), GFP_KERNEL);

	if (!dw)

		return -ENOMEM;



	dw[0].id = snd_soc_dapm_hp;

	dw[0].reg = SND_SOC_NOPM;

	dw[0].name = devm_kasprintf(dev, GFP_KERNEL,

				    AVS_STRING_FMT("ssp", "pb", ssp_port, tdm_slot));

	if (!dw[0].name)

		return -ENOMEM;



	dw[1].id = snd_soc_dapm_mic;

	dw[1].reg = SND_SOC_NOPM;

	dw[1].name = devm_kasprintf(dev, GFP_KERNEL,

				    AVS_STRING_FMT("ssp", "cp", ssp_port, tdm_slot));

	if (!dw[1].name)

		return -ENOMEM;



	*widgets = dw;

	*num_widgets = num_dw;



	return 0;

}



static int avs_i2s_test_probe(struct platform_device *pdev)

{

	struct snd_soc_dapm_widget *widgets;

	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 device *dev = &pdev->dev;

	const char *pname;

	int num_routes, num_widgets;

	int ssp_port, tdm_slot, ret;



	mach = dev_get_platdata(dev);
@@ -156,26 +93,10 @@ static int avs_i2s_test_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = avs_create_dapm_routes(dev, ssp_port, tdm_slot, &routes, &num_routes);

	if (ret) {

		dev_err(dev, "Failed to create dapm routes: %d\n", ret);

		return ret;

	}



	ret = avs_create_dapm_widgets(dev, ssp_port, tdm_slot, &widgets, &num_widgets);

	if (ret) {

		dev_err(dev, "Failed to create dapm widgets: %d\n", ret);

		return ret;

	}



	card->dev = dev;

	card->owner = THIS_MODULE;

	card->dai_link = dai_link;

	card->num_links = 1;

	card->dapm_routes = routes;

	card->num_dapm_routes = num_routes;

	card->dapm_widgets = widgets;

	card->num_dapm_widgets = num_widgets;

	card->fully_routed = true;



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);