From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 2/2] ASoC: soc-core: add soc_dapm_suspend_resume()
Date: 27 Nov 2020 09:07:40 +0900 [thread overview]
Message-ID: <87im9rekfp.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87lfenekgg.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
snd_soc_suspend() and soc_resume_deferred() are calling
same snd_soc_dapm_stream_event() with same logic with different parameter.
This patch adds new soc_dapm_suspend_resume() and share the code.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-core.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c03b7107cb77..50b4ce6374a0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -539,6 +539,21 @@ static void soc_playback_digital_mute(struct snd_soc_card *card, int mute)
}
}
+static void soc_dapm_suspend_resume(struct snd_soc_card *card, int event)
+{
+ struct snd_soc_pcm_runtime *rtd;
+ int stream;
+
+ for_each_card_rtds(card, rtd) {
+
+ if (rtd->dai_link->ignore_suspend)
+ continue;
+
+ for_each_pcm_streams(stream)
+ snd_soc_dapm_stream_event(rtd, stream, event);
+ }
+}
+
/* powers down audio subsystem for suspend */
int snd_soc_suspend(struct device *dev)
{
@@ -576,16 +591,7 @@ int snd_soc_suspend(struct device *dev)
/* close any waiting streams */
snd_soc_flush_all_delayed_work(card);
- for_each_card_rtds(card, rtd) {
- int stream;
-
- if (rtd->dai_link->ignore_suspend)
- continue;
-
- for_each_pcm_streams(stream)
- snd_soc_dapm_stream_event(rtd, stream,
- SND_SOC_DAPM_STREAM_SUSPEND);
- }
+ soc_dapm_suspend_resume(card, SND_SOC_DAPM_STREAM_SUSPEND);
/* Recheck all endpoints too, their state is affected by suspend */
dapm_mark_endpoints_dirty(card);
@@ -656,7 +662,6 @@ static void soc_resume_deferred(struct work_struct *work)
struct snd_soc_card *card =
container_of(work, struct snd_soc_card,
deferred_resume_work);
- struct snd_soc_pcm_runtime *rtd;
struct snd_soc_component *component;
/*
@@ -676,16 +681,7 @@ static void soc_resume_deferred(struct work_struct *work)
snd_soc_component_resume(component);
}
- for_each_card_rtds(card, rtd) {
- int stream;
-
- if (rtd->dai_link->ignore_suspend)
- continue;
-
- for_each_pcm_streams(stream)
- snd_soc_dapm_stream_event(rtd, stream,
- SND_SOC_DAPM_STREAM_RESUME);
- }
+ soc_dapm_suspend_resume(card, SND_SOC_DAPM_STREAM_RESUME);
/* unmute any active DACs */
soc_playback_digital_mute(card, 0);
--
2.25.1
next prev parent reply other threads:[~2020-11-27 0:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 0:07 [PATCH 0/2] ASoC: soc-core: share same logic code Kuninori Morimoto
2020-11-27 0:07 ` [PATCH 1/2] ASoC: soc-core: add soc_playback_digital_mute() Kuninori Morimoto
2020-11-27 0:07 ` Kuninori Morimoto [this message]
2020-11-27 14:15 ` [PATCH 0/2] ASoC: soc-core: share same logic code 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=87im9rekfp.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).