From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 13/17] ASoC: pxa: use snd_soc_dai/component_activity()
Date: 11 May 2020 14:57:37 +0900 [thread overview]
Message-ID: <87mu6f814e.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/pxa/pxa-ssp.c | 8 ++++----
sound/soc/pxa/pxa2xx-i2s.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index e615acaa0199..75aa390d4649 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -94,7 +94,7 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
struct snd_dmaengine_dai_dma_data *dma;
int ret = 0;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_activity(cpu_dai)) {
clk_prepare_enable(ssp->clk);
pxa_ssp_disable(ssp);
}
@@ -119,7 +119,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
struct ssp_device *ssp = priv->ssp;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_activity(cpu_dai)) {
pxa_ssp_disable(ssp);
clk_disable_unprepare(ssp->clk);
}
@@ -138,7 +138,7 @@ static int pxa_ssp_suspend(struct snd_soc_component *component)
struct ssp_priv *priv = snd_soc_component_get_drvdata(component);
struct ssp_device *ssp = priv->ssp;
- if (!component->active)
+ if (!snd_soc_component_activity(component))
clk_prepare_enable(ssp->clk);
priv->cr0 = __raw_readl(ssp->mmio_base + SSCR0);
@@ -165,7 +165,7 @@ static int pxa_ssp_resume(struct snd_soc_component *component)
__raw_writel(priv->to, ssp->mmio_base + SSTO);
__raw_writel(priv->psp, ssp->mmio_base + SSPSP);
- if (component->active)
+ if (snd_soc_component_activity(component))
pxa_ssp_enable(ssp);
else
clk_disable_unprepare(ssp->clk);
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 9a32bf72127a..ec0a2ee5bd78 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -101,7 +101,7 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream,
if (IS_ERR(clk_i2s))
return PTR_ERR(clk_i2s);
- if (!cpu_dai->active)
+ if (!snd_soc_dai_activity(cpu_dai))
SACR0 = 0;
return 0;
--
2.17.1
next prev parent reply other threads:[~2020-05-11 6:04 UTC|newest]
Thread overview: 26+ 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 ` Kuninori Morimoto [this message]
2020-05-11 5:57 ` [PATCH 14/17] ASoC: ti: " Kuninori Morimoto
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
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=87mu6f814e.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).