alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 10/17] ASoC: soc-dai: add snd_soc_dai_compr_shutdown()
Date: 23 Apr 2020 08:15:21 +0900	[thread overview]
Message-ID: <87mu73t8mu.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <871rofunaq.wl-kuninori.morimoto.gx@renesas.com>


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

dai related function should be implemented at soc-dai.c.
This patch adds snd_soc_dai_compr_shutdown().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 include/sound/soc-dai.h  |  2 ++
 sound/soc/soc-compress.c | 12 ++++--------
 sound/soc/soc-dai.c      |  9 +++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index deb99b1469b4..abf4ad25ce68 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -172,6 +172,8 @@ int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream,
 
 int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,
 			      struct snd_compr_stream *cstream);
+void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,
+				struct snd_compr_stream *cstream);
 
 struct snd_soc_dai_ops {
 	/*
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 4065e7b4138d..945d1d15e1d2 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -114,8 +114,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
 machine_err:
 	soc_compr_components_free(cstream, component);
 
-	if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
-		cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+	snd_soc_dai_compr_shutdown(cpu_dai, cstream);
 out:
 	mutex_unlock(&rtd->card->pcm_mutex);
 pm_err:
@@ -204,8 +203,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
 machine_err:
 	soc_compr_components_free(cstream, component);
 open_err:
-	if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
-		cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+	snd_soc_dai_compr_shutdown(cpu_dai, cstream);
 out:
 	dpcm_path_put(&list);
 be_err:
@@ -244,8 +242,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 
 	soc_compr_components_free(cstream, NULL);
 
-	if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
-		cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+	snd_soc_dai_compr_shutdown(cpu_dai, cstream);
 
 	snd_soc_dapm_stream_stop(rtd, stream);
 
@@ -301,8 +298,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 
 	soc_compr_components_free(cstream, NULL);
 
-	if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
-		cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+	snd_soc_dai_compr_shutdown(cpu_dai, cstream);
 
 	mutex_unlock(&fe->card->mutex);
 	return 0;
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 5c88f80b781d..d5cb8b0853a7 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -517,3 +517,12 @@ int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,
 	return soc_dai_ret(dai, ret);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_compr_startup);
+
+void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,
+				struct snd_compr_stream *cstream)
+{
+	if (dai->driver->cops &&
+	    dai->driver->cops->shutdown)
+		dai->driver->cops->shutdown(cstream, dai);
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_compr_shutdown);
-- 
2.17.1


  parent reply	other threads:[~2020-04-22 23:20 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-22 23:13 [PATCH 00/17] ASoC: soc-dai: add snd_soc_dai_xxx() Kuninori Morimoto
2020-04-22 23:13 ` [PATCH 01/17] ASoC: soc-dai: add soc_dai_err() Kuninori Morimoto
2020-04-23 18:33   ` Pierre-Louis Bossart
2020-04-24  4:32     ` Kuninori Morimoto
2020-04-22 23:14 ` [PATCH 02/17] ASoC: soc-dai: don't overwide dai->driver->ops Kuninori Morimoto
2020-04-23 15:09   ` broonie
2020-04-23 22:39     ` Kuninori Morimoto
2020-04-24  9:30       ` Mark Brown
2020-04-22 23:14 ` [PATCH 03/17] ASoC: soc-dai: add snd_soc_pcm_dai_new() Kuninori Morimoto
2020-04-22 23:14 ` [PATCH 04/17] ASoC: soc-dai: add snd_soc_pcm_dai_prepare() Kuninori Morimoto
2020-04-22 23:14 ` [PATCH 05/17] ASoC: soc-dai: add snd_soc_pcm_dai_trigger() Kuninori Morimoto
2020-04-23  1:16   ` Ranjani Sridharan
2020-04-23  1:44     ` Kuninori Morimoto
2020-04-22 23:14 ` [PATCH 06/17] ASoC: soc-dai: add snd_soc_pcm_dai_bespoke_trigger() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 07/17] ASoC: soc-dai: add snd_soc_pcm_dai_probe() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 08/17] ASoC: soc-dai: add snd_soc_pcm_dai_remove() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 09/17] ASoC: soc-dai: add snd_soc_dai_compr_start() Kuninori Morimoto
2020-04-22 23:15 ` Kuninori Morimoto [this message]
2020-04-23  1:31   ` [PATCH 10/17] ASoC: soc-dai: add snd_soc_dai_compr_shutdown() Ranjani Sridharan
2020-04-23  1:46     ` Kuninori Morimoto
2020-04-23  1:50       ` Ranjani Sridharan
2020-04-22 23:15 ` [PATCH 11/17] ASoC: soc-dai: add snd_soc_dai_compr_trigger() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 12/17] ASoC: soc-dai: add snd_soc_dai_compr_set_params() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 13/17] ASoC: soc-dai: add snd_soc_dai_compr_get_params() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 14/17] ASoC: soc-dai: add snd_soc_dai_compr_ack() Kuninori Morimoto
2020-04-22 23:15 ` [PATCH 15/17] ASoC: soc-dai: add snd_soc_dai_compr_pointer() Kuninori Morimoto
2020-04-22 23:16 ` [PATCH 16/17] ASoC: soc-dai: add snd_soc_dai_compr_set_metadata() Kuninori Morimoto
2020-04-22 23:16 ` [PATCH 17/17] ASoC: soc-dai: add snd_soc_dai_compr_get_metadata() Kuninori Morimoto

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=87mu73t8mu.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).