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>

3 files changed, 6 insertions, 10 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3ee608dce2f..8ec63c02dc1 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -300,10 +300,8 @@ struct snd_soc_platform {
 
         int (*probe)(struct platform_device *pdev);
         int (*remove)(struct platform_device *pdev);
-        int (*suspend)(struct platform_device *pdev,
-                struct snd_soc_dai *dai);
-        int (*resume)(struct platform_device *pdev,
-                struct snd_soc_dai *dai);
+        int (*suspend)(struct snd_soc_dai *dai);
+        int (*resume)(struct snd_soc_dai *dai);
 
         /* pcm creation and destruction */
         int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,
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)
 }
 
 #ifdef CONFIG_PM
-static int atmel_pcm_suspend(struct platform_device *pdev,
-        struct snd_soc_dai *dai)
+static int atmel_pcm_suspend(struct snd_soc_dai *dai)
 {
         struct snd_pcm_runtime *runtime = dai->runtime;
         struct atmel_runtime_data *prtd;
@@ -442,8 +441,7 @@ static int atmel_pcm_suspend(struct platform_device *pdev,
         return 0;
 }
 
-static int atmel_pcm_resume(struct platform_device *pdev,
-        struct snd_soc_dai *dai)
+static int atmel_pcm_resume(struct snd_soc_dai *dai)
 {
         struct snd_pcm_runtime *runtime = dai->runtime;
         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)
                 if (cpu_dai->suspend && !cpu_dai->ac97_control)
                         cpu_dai->suspend(pdev, cpu_dai);
                 if (platform->suspend)
-                        platform->suspend(pdev, cpu_dai);
+                        platform->suspend(cpu_dai);
         }
 
         /* close any waiting streams and save state */
@@ -741,7 +741,7 @@ static void soc_resume_deferred(struct work_struct *work)
                 if (cpu_dai->resume && !cpu_dai->ac97_control)
                         cpu_dai->resume(pdev, cpu_dai);
                 if (platform->resume)
-                        platform->resume(pdev, cpu_dai);
+                        platform->resume(cpu_dai);
         }
 
         if (card->resume_post)