OSDN Git Service

ASoC: mxs-saif: drop unneeded snd_soc_dai_set_drvdata
authorJulia Lawall <Julia.Lawall@inria.fr>
Sat, 13 Feb 2021 10:19:05 +0000 (11:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 13:07:06 +0000 (13:07 +0000)
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>

In this case, the whole probe function then does nothing, so drop it.

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
Link: https://lore.kernel.org/r/20210213101907.1318496-3-Julia.Lawall@inria.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/mxs/mxs-saif.c

index 07f8cf9..6a2d24d 100644 (file)
@@ -642,18 +642,8 @@ static const struct snd_soc_dai_ops mxs_saif_dai_ops = {
        .set_fmt = mxs_saif_set_dai_fmt,
 };
 
-static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
-{
-       struct mxs_saif *saif = dev_get_drvdata(dai->dev);
-
-       snd_soc_dai_set_drvdata(dai, saif);
-
-       return 0;
-}
-
 static struct snd_soc_dai_driver mxs_saif_dai = {
        .name = "mxs-saif",
-       .probe = mxs_saif_dai_probe,
        .playback = {
                .channels_min = 2,
                .channels_max = 2,