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 01/12] ASoC: soc-component: add snd_soc_component_compr_open()
Date: 13 Nov 2020 13:15:20 +0900 [thread overview]
Message-ID: <87ft5d7v7x.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 moves soc-compress soc_compr_components_open()
to soc-component as snd_soc_component_compr_open().
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc-component.h | 2 ++
sound/soc/soc-component.c | 23 +++++++++++++++++++++++
sound/soc/soc-compress.c | 31 ++-----------------------------
3 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 21f1d120b68e..0d79a0b30aba 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -444,6 +444,8 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args,
const char **dai_name);
+int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
+ struct snd_soc_component **last);
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 6d719c2db92e..a711bee11712 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -421,6 +421,29 @@ EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
#endif
+int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
+ struct snd_soc_component **last)
+{
+ struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+ struct snd_soc_component *component;
+ int i, ret;
+
+ for_each_rtd_components(rtd, i, component) {
+ if (component->driver->compress_ops &&
+ component->driver->compress_ops->open) {
+ ret = component->driver->compress_ops->open(component, cstream);
+ if (ret < 0) {
+ *last = component;
+ return soc_component_ret(component, ret);
+ }
+ }
+ }
+
+ *last = NULL;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);
+
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 c7ad52a21a29..d55ea0db7901 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -22,33 +22,6 @@
#include <sound/soc-link.h>
#include <linux/pm_runtime.h>
-static int soc_compr_components_open(struct snd_compr_stream *cstream,
- struct snd_soc_component **last)
-{
- struct snd_soc_pcm_runtime *rtd = cstream->private_data;
- struct snd_soc_component *component;
- int i, ret;
-
- for_each_rtd_components(rtd, i, component) {
- if (!component->driver->compress_ops ||
- !component->driver->compress_ops->open)
- continue;
-
- ret = component->driver->compress_ops->open(component, cstream);
- if (ret < 0) {
- dev_err(component->dev,
- "Compress ASoC: can't open platform %s: %d\n",
- component->name, ret);
-
- *last = component;
- return ret;
- }
- }
-
- *last = NULL;
- return 0;
-}
-
static int soc_compr_components_free(struct snd_compr_stream *cstream,
struct snd_soc_component *last)
{
@@ -88,7 +61,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
if (ret < 0)
goto out;
- ret = soc_compr_components_open(cstream, &component);
+ ret = snd_soc_component_compr_open(cstream, &component);
if (ret < 0)
goto machine_err;
@@ -156,7 +129,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
if (ret < 0)
goto out;
- ret = soc_compr_components_open(cstream, &component);
+ ret = snd_soc_component_compr_open(cstream, &component);
if (ret < 0)
goto open_err;
--
2.25.1
next prev parent reply other threads:[~2020-11-13 4:16 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 ` Kuninori Morimoto [this message]
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 ` [PATCH v2 07/12] ASoC: soc-component: add snd_soc_component_compr_get_codec_caps() Kuninori Morimoto
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=87ft5d7v7x.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.