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>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 061f16d4c8780b18f15cafaefb760a5e0780af59..20de0bcaa1372d86daff66b514e2484fa438633b 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -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;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 524a85a73acac44b0a185fa8f0a68b7a0b3fff20..1215a0ec2df0bfcec2d3c5b1ae9a6bc373393ec0 100644 (file)
--- 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 */