Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6423c187 authored by jassi brar's avatar jassi brar Committed by Mark Brown
Browse files

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: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 10cab262

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+0 −2
Original line number Diff line number Diff line
@@ -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 */