From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 14/17] ASoC: ti: use snd_soc_dai/component_activity()
Date: 11 May 2020 14:57:42 +0900 [thread overview]
Message-ID: <87lflz8149.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <875zd39frp.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/ti/davinci-mcasp.c | 2 +-
sound/soc/ti/omap-dmic.c | 4 ++--
sound/soc/ti/omap-mcbsp.c | 4 ++--
sound/soc/ti/omap-mcpdm.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 734ffe925c4d..14e75b6c2644 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -1577,7 +1577,7 @@ static void davinci_mcasp_shutdown(struct snd_pcm_substream *substream,
if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)
return;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_activity(cpu_dai)) {
mcasp->channels = 0;
mcasp->max_format_width = 0;
}
diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c
index 913579c43e9d..42b61bbfd060 100644
--- a/sound/soc/ti/omap-dmic.c
+++ b/sound/soc/ti/omap-dmic.c
@@ -95,7 +95,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&dmic->mutex);
- if (!dai->active)
+ if (!snd_soc_dai_activity(dai))
dmic->active = 1;
else
ret = -EBUSY;
@@ -114,7 +114,7 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream,
cpu_latency_qos_remove_request(&dmic->pm_qos_req);
- if (!dai->active)
+ if (!snd_soc_dai_activity(dai))
dmic->active = 0;
mutex_unlock(&dmic->mutex);
diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c
index 0348963f4df7..685f7add6379 100644
--- a/sound/soc/ti/omap-mcbsp.c
+++ b/sound/soc/ti/omap-mcbsp.c
@@ -788,7 +788,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
int err = 0;
- if (!cpu_dai->active)
+ if (!snd_soc_dai_activity(cpu_dai))
err = omap_mcbsp_request(mcbsp);
/*
@@ -843,7 +843,7 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream,
mcbsp->latency[stream1] = 0;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_activity(cpu_dai)) {
omap_mcbsp_free(mcbsp);
mcbsp->configured = 0;
}
diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index f2dbadea33bb..ef5786f9a840 100644
--- a/sound/soc/ti/omap-mcpdm.c
+++ b/sound/soc/ti/omap-mcpdm.c
@@ -253,7 +253,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&mcpdm->mutex);
- if (!dai->active)
+ if (!snd_soc_dai_activity(dai))
omap_mcpdm_open_streams(mcpdm);
mutex_unlock(&mcpdm->mutex);
@@ -271,7 +271,7 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
mutex_lock(&mcpdm->mutex);
- if (!dai->active) {
+ if (!snd_soc_dai_activity(dai)) {
if (omap_mcpdm_active(mcpdm)) {
omap_mcpdm_stop(mcpdm);
omap_mcpdm_close_streams(mcpdm);
@@ -462,7 +462,7 @@ static int omap_mcpdm_suspend(struct snd_soc_component *component)
{
struct omap_mcpdm *mcpdm = snd_soc_component_get_drvdata(component);
- if (component->active) {
+ if (snd_soc_component_activity(component)) {
omap_mcpdm_stop(mcpdm);
omap_mcpdm_close_streams(mcpdm);
}
@@ -484,7 +484,7 @@ static int omap_mcpdm_resume(struct snd_soc_component *component)
while (mcpdm->pm_active_count--)
pm_runtime_get_sync(mcpdm->dev);
- if (component->active) {
+ if (snd_soc_component_activity(component)) {
omap_mcpdm_open_streams(mcpdm);
omap_mcpdm_start(mcpdm);
}
--
2.17.1
next prev parent reply other threads:[~2020-05-11 6:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 5:55 [PATCH 00/17] ASoC: cleanup DAI/Component activity Kuninori Morimoto
2020-05-11 5:56 ` [PATCH 01/17] ASoC: soc-dai: add snd_soc_dai_activity() Kuninori Morimoto
2020-05-11 22:37 ` Ranjani Sridharan
2020-05-11 22:42 ` Ranjani Sridharan
2020-05-11 5:56 ` [PATCH 02/17] ASoC: use snd_soc_dai/component_activity() Kuninori Morimoto
2020-05-11 22:44 ` Ranjani Sridharan
2020-05-11 23:53 ` Kuninori Morimoto
2020-05-12 0:55 ` Ranjani Sridharan
2020-05-12 4:06 ` Kuninori Morimoto
2020-05-11 5:56 ` [PATCH 03/17] ASoC: soc-dai: add snd_soc_component_activity() Kuninori Morimoto
2020-05-11 19:07 ` Pierre-Louis Bossart
2020-05-11 22:47 ` Ranjani Sridharan
2020-05-11 5:56 ` [PATCH 04/17] ASoC: atomel: use snd_soc_dai/component_activity() Kuninori Morimoto
2020-05-11 5:56 ` [PATCH 05/17] ASoC: bcm: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 06/17] ASoC: cirrus: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 07/17] ASoC: codecs: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 08/17] ASoC: fsl: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 09/17] ASoC: intel: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 10/17] ASoC: jz4740: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 11/17] ASoC: mediatek: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 12/17] ASoC: meson: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 13/17] ASoC: pxa: " Kuninori Morimoto
2020-05-11 5:57 ` Kuninori Morimoto [this message]
2020-05-11 5:57 ` [PATCH 15/17] ASoC: uniphier: " Kuninori Morimoto
2020-05-11 5:57 ` [PATCH 16/17] ASoC: cleanup dai / component active code Kuninori Morimoto
2020-05-11 5:58 ` [PATCH 17/17] ASoC: soc-dai: add snd_soc_dai_stream_activity() Kuninori Morimoto
2020-05-11 8:12 ` kbuild test robot
2020-05-11 8:12 ` kbuild test robot
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=87lflz8149.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.