diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-06 03:39:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-12 17:08:36 -0400 |
commit | 797f283b61e43c54f37d20c1ef3f9682837ef67a (patch) | |
tree | 949eff8267979ced6ccf72b227de074cab063f04 | |
parent | b74f7be90f5bd231358289dca1b25c91fe21143d (diff) |
ASoC: Remove runtime field from DAI
This was initially removed in commit 6423c1875 ("ASoC: Remove runtime field from
DAI"), but was, presumably by accident, brought back in commit f0fba2ad1 ("ASoC:
multi-component - ASoC Multi-Component Support"). But has never been
initialized to anything but NULL ever since. This commit removes it again.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
-rw-r--r-- | sound/soc/soc-compress.c | 1 | ||||
-rw-r--r-- | sound/soc/soc-pcm.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index e2c3e45d0656..688f2ba8009f 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -252,7 +252,6 @@ struct snd_soc_dai { | |||
252 | unsigned int symmetric_rates:1; | 252 | unsigned int symmetric_rates:1; |
253 | unsigned int symmetric_channels:1; | 253 | unsigned int symmetric_channels:1; |
254 | unsigned int symmetric_samplebits:1; | 254 | unsigned int symmetric_samplebits:1; |
255 | struct snd_pcm_runtime *runtime; | ||
256 | unsigned int active; | 255 | unsigned int active; |
257 | unsigned char probed:1; | 256 | unsigned char probed:1; |
258 | 257 | ||
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 91083e6a6b38..5320e8664a59 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c | |||
@@ -203,7 +203,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream) | |||
203 | 203 | ||
204 | if (platform->driver->compr_ops && platform->driver->compr_ops->free) | 204 | if (platform->driver->compr_ops && platform->driver->compr_ops->free) |
205 | platform->driver->compr_ops->free(cstream); | 205 | platform->driver->compr_ops->free(cstream); |
206 | cpu_dai->runtime = NULL; | ||
207 | 206 | ||
208 | if (cstream->direction == SND_COMPRESS_PLAYBACK) { | 207 | if (cstream->direction == SND_COMPRESS_PLAYBACK) { |
209 | if (snd_soc_runtime_ignore_pmdown_time(rtd)) { | 208 | if (snd_soc_runtime_ignore_pmdown_time(rtd)) { |
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2cedf09f6d96..cc002522fd5e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
@@ -555,7 +555,6 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) | |||
555 | 555 | ||
556 | if (platform->driver->ops && platform->driver->ops->close) | 556 | if (platform->driver->ops && platform->driver->ops->close) |
557 | platform->driver->ops->close(substream); | 557 | platform->driver->ops->close(substream); |
558 | cpu_dai->runtime = NULL; | ||
559 | 558 | ||
560 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 559 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
561 | if (snd_soc_runtime_ignore_pmdown_time(rtd)) { | 560 | if (snd_soc_runtime_ignore_pmdown_time(rtd)) { |