diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-12-19 02:37:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-01-09 14:31:21 -0500 |
commit | 10611e1b0b7ab2a82dd7838e5e928fa1501d353c (patch) | |
tree | 000d86300297af89a48ae26d8a0556c401ce5704 | |
parent | fcff45f8e092c17d324028fb6f632fde98983f17 (diff) |
ASoC: remove .bespoke_trigger from snd_soc_platform_driver
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>
-rw-r--r-- | include/sound/soc.h | 2 | ||||
-rw-r--r-- | sound/soc/soc-pcm.c | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 06515e5ca018..1a4311da6126 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -951,8 +951,6 @@ struct snd_soc_platform_driver { | |||
951 | 951 | ||
952 | /* platform stream compress ops */ | 952 | /* platform stream compress ops */ |
953 | const struct snd_compr_ops *compr_ops; | 953 | const struct snd_compr_ops *compr_ops; |
954 | |||
955 | int (*bespoke_trigger)(struct snd_pcm_substream *, int); | ||
956 | }; | 954 | }; |
957 | 955 | ||
958 | struct snd_soc_dai_link_component { | 956 | struct snd_soc_dai_link_component { |
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index a4c93a90b8e9..1739573dcd6a 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
@@ -1055,7 +1055,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream, | |||
1055 | int cmd) | 1055 | int cmd) |
1056 | { | 1056 | { |
1057 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 1057 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
1058 | struct snd_soc_platform *platform = rtd->platform; | ||
1059 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 1058 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
1060 | struct snd_soc_dai *codec_dai; | 1059 | struct snd_soc_dai *codec_dai; |
1061 | int i, ret; | 1060 | int i, ret; |
@@ -1071,12 +1070,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream, | |||
1071 | } | 1070 | } |
1072 | } | 1071 | } |
1073 | 1072 | ||
1074 | if (platform->driver->bespoke_trigger) { | ||
1075 | ret = platform->driver->bespoke_trigger(substream, cmd); | ||
1076 | if (ret < 0) | ||
1077 | return ret; | ||
1078 | } | ||
1079 | |||
1080 | if (cpu_dai->driver->ops && cpu_dai->driver->ops->bespoke_trigger) { | 1073 | if (cpu_dai->driver->ops && cpu_dai->driver->ops->bespoke_trigger) { |
1081 | ret = cpu_dai->driver->ops->bespoke_trigger(substream, cmd, cpu_dai); | 1074 | ret = cpu_dai->driver->ops->bespoke_trigger(substream, cmd, cpu_dai); |
1082 | if (ret < 0) | 1075 | if (ret < 0) |