[2/6] ASoC: remove .bespoke_trigger from snd_soc_platform_driver
diff mbox

Message ID 877f6w74mu.wl%kuninori.morimoto.gx@renesas.com
State Accepted
Commit 10611e1b0b7ab2a82dd7838e5e928fa1501d353c
Headers show

Commit Message

Kuninori Morimoto Dec. 19, 2016, 7:37 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

No existing platform is using .bespoke_trigger.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 include/sound/soc.h | 2 --
 sound/soc/soc-pcm.c | 7 -------
 2 files changed, 9 deletions(-)

Patch
diff mbox

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 06515e5..1a4311d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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 {
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a4c93a9..1739573 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,
 				   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)