aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-03 04:31:47 -0500
committerMark Brown <broonie@kernel.org>2014-11-03 07:17:07 -0500
commitdd63a9c2952ed142c64fd68c1a74d0d6fcac586f (patch)
tree0ed27e83cc1863e1832292e95f894c1c4e6ebc8f /sound/soc/soc-core.c
parent7077148fb50a120d20a50516a332ed6eb9233c16 (diff)
ASoC: Remove snd_soc_platform_driver suspend/resume callbacks
Those are unused and new drivers should use device driver suspend/resume. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a2b51edf6d83..0509d726759d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -592,17 +592,12 @@ int snd_soc_suspend(struct device *dev)
592 592
593 for (i = 0; i < card->num_rtd; i++) { 593 for (i = 0; i < card->num_rtd; i++) {
594 struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; 594 struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
595 struct snd_soc_platform *platform = card->rtd[i].platform;
596 595
597 if (card->rtd[i].dai_link->ignore_suspend) 596 if (card->rtd[i].dai_link->ignore_suspend)
598 continue; 597 continue;
599 598
600 if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control) 599 if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control)
601 cpu_dai->driver->suspend(cpu_dai); 600 cpu_dai->driver->suspend(cpu_dai);
602 if (platform->driver->suspend && !platform->suspended) {
603 platform->driver->suspend(cpu_dai);
604 platform->suspended = 1;
605 }
606 } 601 }
607 602
608 /* close any waiting streams and save state */ 603 /* close any waiting streams and save state */
@@ -775,17 +770,12 @@ static void soc_resume_deferred(struct work_struct *work)
775 770
776 for (i = 0; i < card->num_rtd; i++) { 771 for (i = 0; i < card->num_rtd; i++) {
777 struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; 772 struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
778 struct snd_soc_platform *platform = card->rtd[i].platform;
779 773
780 if (card->rtd[i].dai_link->ignore_suspend) 774 if (card->rtd[i].dai_link->ignore_suspend)
781 continue; 775 continue;
782 776
783 if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control) 777 if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control)
784 cpu_dai->driver->resume(cpu_dai); 778 cpu_dai->driver->resume(cpu_dai);
785 if (platform->driver->resume && platform->suspended) {
786 platform->driver->resume(cpu_dai);
787 platform->suspended = 0;
788 }
789 } 779 }
790 780
791 if (card->resume_post) 781 if (card->resume_post)