summaryrefslogtreecommitdiff
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-31 15:30:28 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-31 19:29:37 +0000
commit5aa44b132eca1d08f5bb9c5c5cb46eec612db686 (patch)
tree567305569ab700d2cf6b80d6889d534bd448f755 /sound/soc/soc-core.c
parent489773c22397c001f54ba4f30856f24407d8d091 (diff)
downloadlinux-3.10-5aa44b132eca1d08f5bb9c5c5cb46eec612db686.tar.gz
linux-3.10-5aa44b132eca1d08f5bb9c5c5cb46eec612db686.tar.bz2
linux-3.10-5aa44b132eca1d08f5bb9c5c5cb46eec612db686.zip
ASoC: core: Support suspend to disk
Use the same pm_ops for all system suspend and resume paths. This isn't ideal for suspend to disk with older CODECs as we'll suspend and then resume the CODEC before powering off all of which takes a long time due to VMID ramps but it's very simple to implement and for modern CODECs the overhead should be minimal. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 35a1e639d7f..091d5f37ae6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1663,8 +1663,7 @@ int snd_soc_poweroff(struct device *dev)
EXPORT_SYMBOL_GPL(snd_soc_poweroff);
const struct dev_pm_ops snd_soc_pm_ops = {
- .suspend = snd_soc_suspend,
- .resume = snd_soc_resume,
+ SET_SYSTEM_SLEEP_PM_OPS(snd_soc_suspend, snd_soc_resume)
.poweroff = snd_soc_poweroff,
};
EXPORT_SYMBOL_GPL(snd_soc_pm_ops);