Re: [PATCH 4/4] ASoC: fsl: drop unneeded snd_soc_dai_set_drvdata

[Nicolin Chen]

On Sat, Feb 13, 2021 at 11:19:07AM +0100, Julia Lawall wrote:
> 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/)
> 
> // 
> @@
> 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);
> // 
> 
> Signed-off-by: Julia Lawall 

Acked-by: Nicolin Chen 

[PATCH 4/4] ASoC: fsl: drop unneeded snd_soc_dai_set_drvdata

[Julia Lawall]

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/)

// 
@@
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);
// 

Signed-off-by: Julia Lawall 

---
 sound/soc/fsl/fsl_micfil.c |2 --
 sound/soc/fsl/fsl_sai.c|2 --
 sound/soc/fsl/fsl_xcvr.c   |1 -
 3 files changed, 5 deletions(-)

diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
index 8aedf6590b28..fd21017fa2bd 100644
--- a/sound/soc/fsl/fsl_micfil.c
+++ b/sound/soc/fsl/fsl_micfil.c
@@ -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;
 }
 
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 5e65b456d3e2..8876d0ed37d9 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -727,8 +727,6 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
snd_soc_dai_init_dma_data(cpu_dai, >dma_params_tx,
>dma_params_rx);
 
-   snd_soc_dai_set_drvdata(cpu_dai, sai);
-
return 0;
 }
 
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index dd228b421e2c..8a3bde718697 100644
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -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, >dma_prms_tx, >dma_prms_rx);
-   snd_soc_dai_set_drvdata(dai, xcvr);
 
snd_soc_add_dai_controls(dai, _xcvr_mode_kctl, 1);
snd_soc_add_dai_controls(dai, _xcvr_arc_mode_kctl, 1);