[5/5] ASoC: Remove runtime field from DAI
diff mbox

Message ID 1399361981-18518-6-git-send-email-lars@metafoo.de
State Accepted
Commit 797f283b61e43c54f37d20c1ef3f9682837ef67a
Headers show

Commit Message

Lars-Peter Clausen May 6, 2014, 7:39 a.m. UTC
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>
---
 include/sound/soc-dai.h  | 1 -
 sound/soc/soc-compress.c | 1 -
 sound/soc/soc-pcm.c      | 1 -
 3 files changed, 3 deletions(-)

Comments

Mark Brown May 12, 2014, 9:08 p.m. UTC | #1
On Tue, May 06, 2014 at 09:39:41AM +0200, Lars-Peter Clausen wrote:
> 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.

Applied, thanks.

Patch
diff mbox

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e2c3e45..688f2ba 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -252,7 +252,6 @@  struct snd_soc_dai {
 	unsigned int symmetric_rates:1;
 	unsigned int symmetric_channels:1;
 	unsigned int symmetric_samplebits:1;
-	struct snd_pcm_runtime *runtime;
 	unsigned int active;
 	unsigned char probed:1;
 
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 91083e6..5320e86 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)
 
 	if (platform->driver->compr_ops && platform->driver->compr_ops->free)
 		platform->driver->compr_ops->free(cstream);
-	cpu_dai->runtime = NULL;
 
 	if (cstream->direction == SND_COMPRESS_PLAYBACK) {
 		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 2cedf09..cc00252 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)
 
 	if (platform->driver->ops && platform->driver->ops->close)
 		platform->driver->ops->close(substream);
-	cpu_dai->runtime = NULL;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {