From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 1/5] ASoC: soc-compress: move soc_compr_free() next to soc_compr_open()
Date: 19 Nov 2020 08:49:57 +0900 [thread overview]
Message-ID: <87o8ju5iwv.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87pn4a5ixl.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch moves soc_compr_free() next to soc_compr_open().
This is prepare for soc_compr_open() cleanup.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-compress.c | 68 ++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 5a751d5d3847..792c2aa1a3c0 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -22,6 +22,40 @@
#include <sound/soc-link.h>
#include <linux/pm_runtime.h>
+static int soc_compr_free(struct snd_compr_stream *cstream)
+{
+ struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+ int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
+
+ mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+
+ snd_soc_runtime_deactivate(rtd, stream);
+
+ snd_soc_dai_digital_mute(codec_dai, 1, stream);
+
+ if (!snd_soc_dai_active(cpu_dai))
+ cpu_dai->rate = 0;
+
+ if (!snd_soc_dai_active(codec_dai))
+ codec_dai->rate = 0;
+
+ snd_soc_link_compr_shutdown(cstream);
+
+ snd_soc_component_compr_free(cstream, NULL);
+
+ snd_soc_dai_compr_shutdown(cpu_dai, cstream);
+
+ snd_soc_dapm_stream_stop(rtd, stream);
+
+ mutex_unlock(&rtd->card->pcm_mutex);
+
+ snd_soc_pcm_component_pm_runtime_put(rtd, cstream, 0);
+
+ return 0;
+}
+
static int soc_compr_open(struct snd_compr_stream *cstream)
{
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -140,40 +174,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
return ret;
}
-static int soc_compr_free(struct snd_compr_stream *cstream)
-{
- struct snd_soc_pcm_runtime *rtd = cstream->private_data;
- struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
- struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
- int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
-
- mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-
- snd_soc_runtime_deactivate(rtd, stream);
-
- snd_soc_dai_digital_mute(codec_dai, 1, stream);
-
- if (!snd_soc_dai_active(cpu_dai))
- cpu_dai->rate = 0;
-
- if (!snd_soc_dai_active(codec_dai))
- codec_dai->rate = 0;
-
- snd_soc_link_compr_shutdown(cstream);
-
- snd_soc_component_compr_free(cstream, NULL);
-
- snd_soc_dai_compr_shutdown(cpu_dai, cstream);
-
- snd_soc_dapm_stream_stop(rtd, stream);
-
- mutex_unlock(&rtd->card->pcm_mutex);
-
- snd_soc_pcm_component_pm_runtime_put(rtd, cstream, 0);
-
- return 0;
-}
-
static int soc_compr_free_fe(struct snd_compr_stream *cstream)
{
struct snd_soc_pcm_runtime *fe = cstream->private_data;
--
2.25.1
next prev parent reply other threads:[~2020-11-18 23:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 23:49 [PATCH 0/5] ASoC: merge soc_compr_open() rollback and soc_compr_free() Kuninori Morimoto
2020-11-18 23:49 ` Kuninori Morimoto [this message]
2020-11-18 23:50 ` [PATCH 2/5] ASoC: soc-dai: add mark for snd_soc_dai_compr_startup/shutdown() Kuninori Morimoto
2020-11-18 23:50 ` [PATCH 3/5] ASoC: soc-component: add mark for snd_soc_component_compr_open/free() Kuninori Morimoto
2020-11-18 23:50 ` [PATCH 4/5] ASoC: soc-component: add mark for snd_soc_link_compr_startup/shutdown() Kuninori Morimoto
2020-11-18 23:50 ` [PATCH 5/5] ASoC: soc-compress: add soc_compr_clean() and call it from soc_compr_open/free() Kuninori Morimoto
2020-11-26 20:05 ` [PATCH 0/5] ASoC: merge soc_compr_open() rollback and soc_compr_free() 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=87o8ju5iwv.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).