lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Remove device from platform suspend and resume operations

Browse Source 
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>
This commit is contained in:
Mark Brown
2008-12-03 18:17:28 +00:00
parent 384c89e2e4
commit 07c84d0409
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/soc.h
View File

@@ -300,10 +300,8 @@ struct snd_soc_platform {
int (*probe)(struct platform_device *pdev); int (*probe)(struct platform_device *pdev);
int (*remove)(struct platform_device *pdev); int (*remove)(struct platform_device *pdev);
int (*suspend)(struct platform_device *pdev, int (*suspend)(struct snd_soc_dai *dai);
struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai);
int (*resume)(struct platform_device *pdev,
struct snd_soc_dai *dai);
/* pcm creation and destruction */ /* pcm creation and destruction */
int (*pcm_new)(struct snd_card *, struct snd_soc_dai *, int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,

6
sound/soc/atmel/atmel-pcm.c
View File

@@ -417,8 +417,7 @@ static void atmel_pcm_free_dma_buffers(struct snd_pcm *pcm)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int atmel_pcm_suspend(struct platform_device *pdev, static int atmel_pcm_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct snd_pcm_runtime *runtime = dai->runtime; struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd; struct atmel_runtime_data *prtd;
@@ -442,8 +441,7 @@ static int atmel_pcm_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int atmel_pcm_resume(struct platform_device *pdev, static int atmel_pcm_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct snd_pcm_runtime *runtime = dai->runtime; struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd; struct atmel_runtime_data *prtd;

4
sound/soc/soc-core.c
View File

@@ -652,7 +652,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
if (cpu_dai->suspend && !cpu_dai->ac97_control) if (cpu_dai->suspend && !cpu_dai->ac97_control)
cpu_dai->suspend(pdev, cpu_dai); cpu_dai->suspend(pdev, cpu_dai);
if (platform->suspend) if (platform->suspend)
platform->suspend(pdev, cpu_dai); platform->suspend(cpu_dai);
} }
/* close any waiting streams and save state */ /* 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) if (cpu_dai->resume && !cpu_dai->ac97_control)
cpu_dai->resume(pdev, cpu_dai); cpu_dai->resume(pdev, cpu_dai);
if (platform->resume) if (platform->resume)
platform->resume(pdev, cpu_dai); platform->resume(cpu_dai);
} }
if (card->resume_post) if (card->resume_post)