iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: soc-core: add soc_dapm_suspend_resume()

Browse Source 
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>
Link: https://lore.kernel.org/r/87im9rekfp.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-11-27 09:07:40 +09:00 committed by Mark Brown
parent d4c1d9eb66
commit baed393e85
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sound/soc/soc-core.c
View File

@ -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);