aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-03 13:17:28 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-03 13:27:10 -0500
commit07c84d0409f3551b79d676630d8ee76bb551598d (patch)
tree547a9f23de0355003348ee2a6edbd74bee1812ff /sound
parent384c89e2e4cb5879b86a38414d1b3bb2b23ec8ee (diff)
ASoC: Remove device from platform suspend and resume operations
None of the platforms are actually using the SoC device so remove it (only atmel actually has a suspend method). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/atmel-pcm.c6
-rw-r--r--sound/soc/soc-core.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index 394412fb396..8507aa1cd81 100644
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -417,8 +417,7 @@ static void atmel_pcm_free_dma_buffers(struct snd_pcm *pcm)
417} 417}
418 418
419#ifdef CONFIG_PM 419#ifdef CONFIG_PM
420static int atmel_pcm_suspend(struct platform_device *pdev, 420static int atmel_pcm_suspend(struct snd_soc_dai *dai)
421 struct snd_soc_dai *dai)
422{ 421{
423 struct snd_pcm_runtime *runtime = dai->runtime; 422 struct snd_pcm_runtime *runtime = dai->runtime;
424 struct atmel_runtime_data *prtd; 423 struct atmel_runtime_data *prtd;
@@ -442,8 +441,7 @@ static int atmel_pcm_suspend(struct platform_device *pdev,
442 return 0; 441 return 0;
443} 442}
444 443
445static int atmel_pcm_resume(struct platform_device *pdev, 444static int atmel_pcm_resume(struct snd_soc_dai *dai)
446 struct snd_soc_dai *dai)
447{ 445{
448 struct snd_pcm_runtime *runtime = dai->runtime; 446 struct snd_pcm_runtime *runtime = dai->runtime;
449 struct atmel_runtime_data *prtd; 447 struct atmel_runtime_data *prtd;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 34114398b91..f83852f1146 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -652,7 +652,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
652 if (cpu_dai->suspend && !cpu_dai->ac97_control) 652 if (cpu_dai->suspend && !cpu_dai->ac97_control)
653 cpu_dai->suspend(pdev, cpu_dai); 653 cpu_dai->suspend(pdev, cpu_dai);
654 if (platform->suspend) 654 if (platform->suspend)
655 platform->suspend(pdev, cpu_dai); 655 platform->suspend(cpu_dai);
656 } 656 }
657 657
658 /* close any waiting streams and save state */ 658 /* close any waiting streams and save state */
@@ -741,7 +741,7 @@ static void soc_resume_deferred(struct work_struct *work)
741 if (cpu_dai->resume && !cpu_dai->ac97_control) 741 if (cpu_dai->resume && !cpu_dai->ac97_control)
742 cpu_dai->resume(pdev, cpu_dai); 742 cpu_dai->resume(pdev, cpu_dai);
743 if (platform->resume) 743 if (platform->resume)
744 platform->resume(pdev, cpu_dai); 744 platform->resume(cpu_dai);
745 } 745 }
746 746
747 if (card->resume_post) 747 if (card->resume_post)