ASoC: remove .bespoke_trigger from snd_soc_platform_driver
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 19 Dec 2016 07:37:18 +0000 (07:37 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 9 Jan 2017 19:31:21 +0000 (19:31 +0000)
No existing platform is using .bespoke_trigger.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h
sound/soc/soc-pcm.c

index 06515e5ca01889688cf907359740ab4c0545a355..1a4311da6126629f6b12a0ba4345f8c40cabb465 100644 (file)
@@ -951,8 +951,6 @@ struct snd_soc_platform_driver {
 
        /* platform stream compress ops */
        const struct snd_compr_ops *compr_ops;
-
-       int (*bespoke_trigger)(struct snd_pcm_substream *, int);
 };
 
 struct snd_soc_dai_link_component {
index a4c93a90b8e9740989979c38deef36d3f4338c1c..1739573dcd6a3dc9206781f6faadfadc77de6f4f 100644 (file)
@@ -1055,7 +1055,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
                                   int cmd)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_platform *platform = rtd->platform;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
        struct snd_soc_dai *codec_dai;
        int i, ret;
@@ -1071,12 +1070,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
                }
        }
 
-       if (platform->driver->bespoke_trigger) {
-               ret = platform->driver->bespoke_trigger(substream, cmd);
-               if (ret < 0)
-                       return ret;
-       }
-
        if (cpu_dai->driver->ops && cpu_dai->driver->ops->bespoke_trigger) {
                ret = cpu_dai->driver->ops->bespoke_trigger(substream, cmd, cpu_dai);
                if (ret < 0)