Unverified Commit 33683cbf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: remove unnecessary dai_link->platform 



dai_link->platform is no longer needed if CPU and Platform are
same Component. This patch removes unnecessary dai_link->platform.
Dummy Platform is also not necessary.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o7ojjd06.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/imx-audmix.c

+4 −10
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev) 
	for (i = 0; i < num_dai; i++) {

		struct snd_soc_dai_link_component *dlc;



		/* for CPU/Codec/Platform x 2 */

		dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL);

		/* for CPU/Codec x 2 */

		dlc = devm_kcalloc(&pdev->dev, 4, sizeof(*dlc), GFP_KERNEL);

		if (!dlc)

			return -ENOMEM;
@@ -240,11 +240,9 @@ static int imx_audmix_probe(struct platform_device *pdev) 


		priv->dai[i].cpus = &dlc[0];

		priv->dai[i].codecs = &dlc[1];

		priv->dai[i].platforms = &dlc[2];



		priv->dai[i].num_cpus = 1;

		priv->dai[i].num_codecs = 1;

		priv->dai[i].num_platforms = 1;



		priv->dai[i].name = dai_name;

		priv->dai[i].stream_name = "HiFi-AUDMIX-FE";
@@ -252,7 +250,6 @@ static int imx_audmix_probe(struct platform_device *pdev) 
		priv->dai[i].codecs->name = "snd-soc-dummy";

		priv->dai[i].cpus->of_node = args.np;

		priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);

		priv->dai[i].platforms->of_node = args.np;

		priv->dai[i].dynamic = 1;

		priv->dai[i].dpcm_playback = 1;

		priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
@@ -267,20 +264,17 @@ static int imx_audmix_probe(struct platform_device *pdev) 
		be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,

				       "AUDMIX-Capture-%d", i);



		priv->dai[num_dai + i].cpus = &dlc[3];

		priv->dai[num_dai + i].codecs = &dlc[4];

		priv->dai[num_dai + i].platforms = &dlc[5];

		priv->dai[num_dai + i].cpus = &dlc[2];

		priv->dai[num_dai + i].codecs = &dlc[3];



		priv->dai[num_dai + i].num_cpus = 1;

		priv->dai[num_dai + i].num_codecs = 1;

		priv->dai[num_dai + i].num_platforms = 1;



		priv->dai[num_dai + i].name = be_name;

		priv->dai[num_dai + i].codecs->dai_name = "snd-soc-dummy-dai";

		priv->dai[num_dai + i].codecs->name = "snd-soc-dummy";

		priv->dai[num_dai + i].cpus->of_node = audmix_np;

		priv->dai[num_dai + i].cpus->dai_name = be_name;

		priv->dai[num_dai + i].platforms->name = "snd-soc-dummy";

		priv->dai[num_dai + i].no_pcm = 1;

		priv->dai[num_dai + i].dpcm_playback = 1;

		priv->dai[num_dai + i].dpcm_capture  = 1;

sound/soc/fsl/imx-spdif.c

+1 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
	}



	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);

	comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);

	if (!data || !comp) {

		ret = -ENOMEM;

		goto end;
@@ -34,18 +34,15 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 


	data->dai.cpus		= &comp[0];

	data->dai.codecs	= &comp[1];

	data->dai.platforms	= &comp[2];



	data->dai.num_cpus	= 1;

	data->dai.num_codecs	= 1;

	data->dai.num_platforms	= 1;



	data->dai.name = "S/PDIF PCM";

	data->dai.stream_name = "S/PDIF PCM";

	data->dai.codecs->dai_name = "snd-soc-dummy-dai";

	data->dai.codecs->name = "snd-soc-dummy";

	data->dai.cpus->of_node = spdif_np;

	data->dai.platforms->of_node = spdif_np;

	data->dai.playback_only = true;

	data->dai.capture_only = true;