Unverified Commit 6c402ace authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: rt5682: Adjust platform name 



The name of the platform component matches the name of the card's
platform_device.

This allows for simplifying card and dai_link initialization:
- drop mach->mach_params.platform usage
- drop snd_soc_fixup_dai_links_platform_name() usage

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Message-ID: <20250902094853.1231842-17-cezary.rojewski@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b0e52296

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

+4 −11
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ avs_rt5682_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_param 
	return 0;

}



static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,

			       int tdm_slot, struct snd_soc_dai_link **dai_link)

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

			       struct snd_soc_dai_link **dai_link)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;
@@ -215,8 +215,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;



	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
@@ -231,6 +229,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	platform->name = dev_name(dev);

	dl->num_cpus = 1;

	dl->num_codecs = 1;

	dl->platforms = platform;
@@ -272,7 +271,6 @@ static int avs_rt5682_probe(struct platform_device *pdev) 
	struct snd_soc_card *card;

	struct snd_soc_jack *jack;

	struct device *dev = &pdev->dev;

	const char *pname;

	int ssp_port, tdm_slot, ret;



	if (pdev->id_entry && pdev->id_entry->driver_data)
@@ -282,14 +280,13 @@ static int avs_rt5682_probe(struct platform_device *pdev) 
	dev_dbg(dev, "avs_rt5682_quirk = %lx\n", avs_rt5682_quirk);



	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	pdata = mach->pdata;



	ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);

	if (ret)

		return ret;



	ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);

	ret = avs_create_dai_link(dev, ssp_port, tdm_slot, &dai_link);

	if (ret) {

		dev_err(dev, "Failed to create dai link: %d", ret);

		return ret;
@@ -321,10 +318,6 @@ static int avs_rt5682_probe(struct platform_device *pdev) 
	card->fully_routed = true;

	snd_soc_card_set_drvdata(card, jack);



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);

	if (ret)

		return ret;



	return devm_snd_soc_register_deferrable_card(dev, card);

}