Unverified Commit eb0d22d7 authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown
Browse files

ASoC: fsl: drop unneeded snd_soc_dai_set_drvdata 

snd_soc_dai_set_drvdata is not needed when the set data comes from
snd_soc_dai_get_drvdata or dev_get_drvdata.  The problem was fixed
usingthe following semantic patch: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression x,y,e;
@@
	x = dev_get_drvdata(y->dev)
	... when != x = e
-	snd_soc_dai_set_drvdata(y,x);

@@
expression x,y,e;
@@
	x = snd_soc_dai_get_drvdata(y)
	... when != x = e
-	snd_soc_dai_set_drvdata(y,x);
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@inria.fr>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Link: https://lore.kernel.org/r/20210213101907.1318496-5-Julia.Lawall@inria.fr


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

sound/soc/fsl/fsl_micfil.c

+0 −2
Original line number Diff line number Diff line
@@ -423,8 +423,6 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) 
		return ret;

	}



	snd_soc_dai_set_drvdata(cpu_dai, micfil);



	return 0;

}

sound/soc/fsl/fsl_sai.c

+0 −2
Original line number Diff line number Diff line
@@ -727,8 +727,6 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) 
	snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx,

				&sai->dma_params_rx);



	snd_soc_dai_set_drvdata(cpu_dai, sai);



	return 0;

}

sound/soc/fsl/fsl_xcvr.c

+0 −1
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ static int fsl_xcvr_dai_probe(struct snd_soc_dai *dai) 
	struct fsl_xcvr *xcvr = snd_soc_dai_get_drvdata(dai);



	snd_soc_dai_init_dma_data(dai, &xcvr->dma_prms_tx, &xcvr->dma_prms_rx);

	snd_soc_dai_set_drvdata(dai, xcvr);



	snd_soc_add_dai_controls(dai, &fsl_xcvr_mode_kctl, 1);

	snd_soc_add_dai_controls(dai, &fsl_xcvr_arc_mode_kctl, 1);