aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorjassi brar <jassisinghbrar@gmail.com>2010-02-22 16:00:20 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-02-22 14:15:30 +0000
commit6423c1875c87fa5ae56974ab8386d7c6110e3701 (patch)
treec41bdc54dc4a1414d28a63abeee38754fe64f55d /sound/soc/soc-core.c
parentASoC: Change how suspend and resume obtain the PCM runtime (diff)
downloadlinux-dev-6423c1875c87fa5ae56974ab8386d7c6110e3701.tar.xz
linux-dev-6423c1875c87fa5ae56974ab8386d7c6110e3701.zip
ASoC: Remove runtime field from DAI
In order for having snd_soc_dais shared among two or more dai_links, remove the relatively global runtime field from the struct snd_soc_dai Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 524a85a73aca..1215a0ec2df0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -459,7 +459,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
else
cpu_dai->capture.active = codec_dai->capture.active = 1;
cpu_dai->active = codec_dai->active = 1;
- cpu_dai->runtime = runtime;
card->codec->active++;
mutex_unlock(&pcm_mutex);
return 0;
@@ -559,7 +558,6 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
if (platform->pcm_ops->close)
platform->pcm_ops->close(substream);
- cpu_dai->runtime = NULL;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
/* start delayed pop wq here for playback streams */