aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-12-19 02:36:58 -0500
committerMark Brown <broonie@kernel.org>2017-01-09 14:31:21 -0500
commitfcff45f8e092c17d324028fb6f632fde98983f17 (patch)
tree55abfb05352803a33cb9b05c3f1ce4194932c63f
parent99b04f4c4051f71bc0665a66e11b8fbed17c8958 (diff)
ASoC: remove .delay from snd_soc_platform_driver
No existing platform is using .delay. 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.h7
-rw-r--r--sound/soc/soc-pcm.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e580a675ea77..06515e5ca018 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -946,13 +946,6 @@ struct snd_soc_platform_driver {
946 int (*pcm_new)(struct snd_soc_pcm_runtime *); 946 int (*pcm_new)(struct snd_soc_pcm_runtime *);
947 void (*pcm_free)(struct snd_pcm *); 947 void (*pcm_free)(struct snd_pcm *);
948 948
949 /*
950 * For platform caused delay reporting.
951 * Optional.
952 */
953 snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
954 struct snd_soc_dai *);
955
956 /* platform stream pcm ops */ 949 /* platform stream pcm ops */
957 const struct snd_pcm_ops *ops; 950 const struct snd_pcm_ops *ops;
958 951
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a9ef8ae20e44..a4c93a90b8e9 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1116,13 +1116,6 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
1116 } 1116 }
1117 delay += codec_delay; 1117 delay += codec_delay;
1118 1118
1119 /*
1120 * None of the existing platform drivers implement delay(), so
1121 * for now the codec_dai of first multicodec entry is used
1122 */
1123 if (platform->driver->delay)
1124 delay += platform->driver->delay(substream, rtd->codec_dais[0]);
1125
1126 runtime->delay = delay; 1119 runtime->delay = delay;
1127 1120
1128 return offset; 1121 return offset;