hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
jassi brar 2010-02-22 16:00:20 +09:00 committed by Mark Brown
parent 10cab262f4
commit 6423c1875c
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-dai.h
View File

@ -215,7 +215,6 @@ struct snd_soc_dai {
unsigned int symmetric_rates:1; unsigned int symmetric_rates:1;
/* DAI runtime info */ /* DAI runtime info */
struct snd_pcm_runtime *runtime;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
unsigned int active; unsigned int active;
unsigned char pop_wait:1; unsigned char pop_wait:1;

2
sound/soc/soc-core.c
View File

@ -459,7 +459,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
else else
cpu_dai->capture.active = codec_dai->capture.active = 1; cpu_dai->capture.active = codec_dai->capture.active = 1;
cpu_dai->active = codec_dai->active = 1; cpu_dai->active = codec_dai->active = 1;
cpu_dai->runtime = runtime;
card->codec->active++; card->codec->active++;
mutex_unlock(&pcm_mutex); mutex_unlock(&pcm_mutex);
return 0; return 0;
@ -559,7 +558,6 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
if (platform->pcm_ops->close) if (platform->pcm_ops->close)
platform->pcm_ops->close(substream); platform->pcm_ops->close(substream);
cpu_dai->runtime = NULL;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
/* start delayed pop wq here for playback streams */ /* start delayed pop wq here for playback streams */