diff options
author | jassi brar <jassisinghbrar@gmail.com> | 2010-02-22 02:00:20 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-22 09:15:30 -0500 |
commit | 6423c1875c87fa5ae56974ab8386d7c6110e3701 (patch) | |
tree | c41bdc54dc4a1414d28a63abeee38754fe64f55d | |
parent | 10cab262f49ee4574a20ab4c445bc4fdc41c36a8 (diff) |
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>
-rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 061f16d4c878..20de0bcaa137 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -215,7 +215,6 @@ struct snd_soc_dai { | |||
215 | unsigned int symmetric_rates:1; | 215 | unsigned int symmetric_rates:1; |
216 | 216 | ||
217 | /* DAI runtime info */ | 217 | /* DAI runtime info */ |
218 | struct snd_pcm_runtime *runtime; | ||
219 | struct snd_soc_codec *codec; | 218 | struct snd_soc_codec *codec; |
220 | unsigned int active; | 219 | unsigned int active; |
221 | unsigned char pop_wait:1; | 220 | unsigned char pop_wait:1; |
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) | |||
459 | else | 459 | else |
460 | cpu_dai->capture.active = codec_dai->capture.active = 1; | 460 | cpu_dai->capture.active = codec_dai->capture.active = 1; |
461 | cpu_dai->active = codec_dai->active = 1; | 461 | cpu_dai->active = codec_dai->active = 1; |
462 | cpu_dai->runtime = runtime; | ||
463 | card->codec->active++; | 462 | card->codec->active++; |
464 | mutex_unlock(&pcm_mutex); | 463 | mutex_unlock(&pcm_mutex); |
465 | return 0; | 464 | return 0; |
@@ -559,7 +558,6 @@ static int soc_codec_close(struct snd_pcm_substream *substream) | |||
559 | 558 | ||
560 | if (platform->pcm_ops->close) | 559 | if (platform->pcm_ops->close) |
561 | platform->pcm_ops->close(substream); | 560 | platform->pcm_ops->close(substream); |
562 | cpu_dai->runtime = NULL; | ||
563 | 561 | ||
564 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 562 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
565 | /* start delayed pop wq here for playback streams */ | 563 | /* start delayed pop wq here for playback streams */ |