All of lore.kernel.org
 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 v2 07/12] ASoC: soc-component: add snd_soc_component_compr_get_codec_caps()
Date: 13 Nov 2020 13:16:11 +0900	[thread overview]
Message-ID: <877dqp7v6i.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87h7pt7v93.wl-kuninori.morimoto.gx@renesas.com>

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

component related function should be implemented at
soc-component.c.
This patch adds snd_soc_component_compr_get_codec_caps().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 include/sound/soc-component.h |  2 ++
 sound/soc/soc-component.c     | 24 ++++++++++++++++++++++++
 sound/soc/soc-compress.c      | 27 ++-------------------------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 7fd45462963e..d91e0eb1546d 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -455,6 +455,8 @@ int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream,
 				       struct snd_codec *params);
 int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
 				     struct snd_compr_caps *caps);
+int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
+					   struct snd_compr_codec_caps *codec);
 
 int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
 int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index b885e96cc8ae..8fba1a395f1e 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -547,6 +547,30 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_caps);
 
+int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
+					   struct snd_compr_codec_caps *codec)
+{
+	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+	struct snd_soc_component *component;
+	int i, ret = 0;
+
+	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+
+	for_each_rtd_components(rtd, i, component) {
+		if (component->driver->compress_ops &&
+		    component->driver->compress_ops->get_codec_caps) {
+			ret = component->driver->compress_ops->get_codec_caps(
+				component, cstream, codec);
+			break;
+		}
+	}
+
+	mutex_unlock(&rtd->card->pcm_mutex);
+
+	return soc_component_ret(component, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_codec_caps);
+
 static unsigned int soc_component_read_no_lock(
 	struct snd_soc_component *component,
 	unsigned int reg)
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index e7530712ab91..a82bd02d5519 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -409,29 +409,6 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
 	return ret;
 }
 
-static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
-				    struct snd_compr_codec_caps *codec)
-{
-	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_component *component;
-	int i, ret = 0;
-
-	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-
-	for_each_rtd_components(rtd, i, component) {
-		if (!component->driver->compress_ops ||
-		    !component->driver->compress_ops->get_codec_caps)
-			continue;
-
-		ret = component->driver->compress_ops->get_codec_caps(
-			component, cstream, codec);
-		break;
-	}
-
-	mutex_unlock(&rtd->card->pcm_mutex);
-	return ret;
-}
-
 static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -574,7 +551,7 @@ static struct snd_compr_ops soc_compr_ops = {
 	.pointer	= soc_compr_pointer,
 	.ack		= soc_compr_ack,
 	.get_caps	= snd_soc_component_compr_get_caps,
-	.get_codec_caps = soc_compr_get_codec_caps
+	.get_codec_caps = snd_soc_component_compr_get_codec_caps,
 };
 
 /* ASoC Dynamic Compress operations */
@@ -589,7 +566,7 @@ static struct snd_compr_ops soc_compr_dyn_ops = {
 	.pointer	= soc_compr_pointer,
 	.ack		= soc_compr_ack,
 	.get_caps	= snd_soc_component_compr_get_caps,
-	.get_codec_caps = soc_compr_get_codec_caps
+	.get_codec_caps = snd_soc_component_compr_get_codec_caps,
 };
 
 /**
-- 
2.25.1


  parent reply	other threads:[~2020-11-13  4:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13  4:14 [PATCH v2 00/12] ASoC: soc-component: add snd_soc_component_xxx() Kuninori Morimoto
2020-11-13  4:15 ` [PATCH v2 01/12] ASoC: soc-component: add snd_soc_component_compr_open() Kuninori Morimoto
2020-11-13  4:15 ` [PATCH v2 02/12] ASoC: soc-component: add snd_soc_component_compr_free() Kuninori Morimoto
2020-11-13  4:15 ` [PATCH v2 03/12] ASoC: soc-component: add snd_soc_component_compr_trigger() Kuninori Morimoto
2020-11-13  4:15 ` [PATCH v2 04/12] ASoC: soc-component: add snd_soc_component_compr_set_params() Kuninori Morimoto
2020-11-13  4:15 ` [PATCH v2 05/12] ASoC: soc-component: add snd_soc_component_compr_get_params() Kuninori Morimoto
2020-11-13  4:16 ` [PATCH v2 06/12] ASoC: soc-component: add snd_soc_component_compr_get_caps() Kuninori Morimoto
2020-11-13  4:16 ` Kuninori Morimoto [this message]
2020-11-13  4:16 ` [PATCH v2 08/12] ASoC: soc-component: add snd_soc_component_compr_ack() Kuninori Morimoto
2020-11-13  4:16 ` [PATCH v2 09/12] ASoC: soc-component: add snd_soc_component_compr_pointer() Kuninori Morimoto
2020-11-13  4:16 ` [PATCH v2 10/12] ASoC: soc-component: add snd_soc_component_compr_copy() Kuninori Morimoto
2020-11-13  4:16 ` [PATCH v2 11/12] ASoC: soc-component: add snd_soc_component_compr_set_metadata() Kuninori Morimoto
2020-11-13  4:16 ` [PATCH v2 12/12] ASoC: soc-component: add snd_soc_component_compr_get_metadata() Kuninori Morimoto
2020-11-13 20:34 ` [PATCH v2 00/12] ASoC: soc-component: add snd_soc_component_xxx() Ranjani Sridharan
2020-11-18 20:59 ` 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=877dqp7v6i.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.