diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-01-10 11:36:07 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-01-10 13:32:50 +0000 |
| commit | d7a8cb4931652256a01383bb3ea10fab316e72a1 (patch) | |
| tree | 9ed82c5264b2f9aae8bb37cecc88e5656e56765d /sound/soc/soc-core.c | |
| parent | ASoC: soc-core: care .ignore_suspend for Component suspend (diff) | |
| download | wireguard-linux-d7a8cb4931652256a01383bb3ea10fab316e72a1.tar.xz wireguard-linux-d7a8cb4931652256a01383bb3ea10fab316e72a1.zip | |
ASoC: soc-core: remove duplicate pinctrl operation when suspend
snd_soc_suspend() are doing below for pinctrl_pm_select_sleep_state()
int snd_soc_suspend(struct device *dev)
{
...
for_each_card_components(card, component) {
...
(1) pinctrl_pm_select_sleep_state(component->dev);
}
for_each_card_rtds(card, rtd) {
...
(2) pinctrl_pm_select_sleep_state(cpu_dai->dev);
}
}
(1) is called for all component (CPU/Codec/Platform), and
(2) is called for CPU DAIs.
Here, component->dev is same as dai->dev.
This means, it is called in duplicate on CPU case.
This patch removes (2).
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-By: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/875zhkt4vc.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8a1b4ffa6ca6..191b68732e56 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -619,9 +619,6 @@ int snd_soc_suspend(struct device *dev) if (cpu_dai->driver->bus_control) snd_soc_dai_suspend(cpu_dai); - - /* deactivate pins to sleep state */ - pinctrl_pm_select_sleep_state(cpu_dai->dev); } if (card->suspend_post) |