Skip to content

L
linux
Commit 497c11a9 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

parents b79e16cb ccffbd27
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sound/soc/codecs/pcm512x.c
View file @ 497c11a9
...@@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev) ...@@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev)
} }
EXPORT_SYMBOL_GPL(pcm512x_remove); EXPORT_SYMBOL_GPL(pcm512x_remove);
#ifdef CONFIG_PM_RUNTIME
static int pcm512x_suspend(struct device *dev) static int pcm512x_suspend(struct device *dev)
{ {
struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
...@@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev) ...@@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev)
return 0; return 0;
} }
#endif
const struct dev_pm_ops pcm512x_pm_ops = { const struct dev_pm_ops pcm512x_pm_ops = {
SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL) SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7