Skip to content

Commit

Permalink
ASoC: Remove runtime field from DAI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jassi brar authored and Mark Brown committed Feb 22, 2010
1 parent 10cab26 commit 6423c18
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion include/sound/soc-dai.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ struct snd_soc_dai {
unsigned int symmetric_rates:1;

/* DAI runtime info */
struct snd_pcm_runtime *runtime;
struct snd_soc_codec *codec;
unsigned int active;
unsigned char pop_wait:1;
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 6423c18

Please sign in to comment.