Skip to content

Commit

Permalink
ASoC: Remove device from platform suspend and resume operations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Dec 3, 2008
1 parent 384c89e commit 07c84d0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
6 changes: 2 additions & 4 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *,
Expand Down
6 changes: 2 additions & 4 deletions sound/soc/atmel/atmel-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 07c84d0

Please sign in to comment.