From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>,
Bo Shen <voice.shen@atmel.com>
Subject: [PATCH 5/5] ASoC: Remove runtime field from DAI
Date: Tue, 6 May 2014 09:39:41 +0200 [thread overview]
Message-ID: <1399361981-18518-6-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1399361981-18518-1-git-send-email-lars@metafoo.de>
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(-)
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)) {
--
1.8.0
next prev parent reply other threads:[~2014-05-06 7:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-06 7:39 [PATCH 0/5] ASoC: Trivial bits and cleanups Lars-Peter Clausen
2014-05-06 7:39 ` [PATCH 1/5] ASoC: Remove card's DAI list Lars-Peter Clausen
2014-05-07 9:21 ` Mark Brown
2014-05-06 7:39 ` [PATCH 2/5] ASoC: Remove unused 'list' field form card Lars-Peter Clausen
2014-05-07 9:21 ` Mark Brown
2014-05-06 7:39 ` [PATCH 3/5] ASoC: Remove unused num_dai field from CODEC Lars-Peter Clausen
2014-05-07 9:22 ` Mark Brown
2014-05-06 7:39 ` [PATCH 4/5] ASoC: atmel-pcm-pdc: Remove broken suspend/resume code Lars-Peter Clausen
2014-05-12 21:08 ` Mark Brown
2014-05-06 7:39 ` Lars-Peter Clausen [this message]
2014-05-12 21:08 ` [PATCH 5/5] ASoC: Remove runtime field from DAI Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399361981-18518-6-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=voice.shen@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox