Skip to content

Commit

Permalink
ASoC: Pass dai_link as argument to platform suspend and resume
Browse files Browse the repository at this point in the history
Passing pointer to relevant dai_link provides easier reach to the
ASoC tree in suspend/resume of snd_soc_platform. It also provides
direct access to the dai at the other end of the dai_link.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
jassi brar authored and Mark Brown committed Feb 22, 2010
1 parent 6c5f1fe commit d273ebe
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ struct snd_soc_dai_mode;
struct snd_soc_pcm_runtime;
struct snd_soc_dai;
struct snd_soc_platform;
struct snd_soc_dai_link;
struct snd_soc_codec;
struct soc_enum;
struct snd_soc_ac97_ops;
Expand Down Expand Up @@ -461,8 +462,8 @@ struct snd_soc_platform {

int (*probe)(struct platform_device *pdev);
int (*remove)(struct platform_device *pdev);
int (*suspend)(struct snd_soc_dai *dai);
int (*resume)(struct snd_soc_dai *dai);
int (*suspend)(struct snd_soc_dai_link *dai_link);
int (*resume)(struct snd_soc_dai_link *dai_link);

/* pcm creation and destruction */
int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,
Expand Down
6 changes: 4 additions & 2 deletions sound/soc/atmel/atmel-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,9 @@ static void atmel_pcm_free_dma_buffers(struct snd_pcm *pcm)
}

#ifdef CONFIG_PM
static int atmel_pcm_suspend(struct snd_soc_dai *dai)
static int atmel_pcm_suspend(struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dai *dai = dai_link->cpu_dai;
struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd;
struct atmel_pcm_dma_params *params;
Expand All @@ -439,8 +440,9 @@ static int atmel_pcm_suspend(struct snd_soc_dai *dai)
return 0;
}

static int atmel_pcm_resume(struct snd_soc_dai *dai)
static int atmel_pcm_resume(struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dai *dai = dai_link->cpu_dai;
struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd;
struct atmel_pcm_dma_params *params;
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 @@ -854,7 +854,7 @@ static int soc_suspend(struct device *dev)
if (cpu_dai->suspend && !cpu_dai->ac97_control)
cpu_dai->suspend(cpu_dai);
if (platform->suspend)
platform->suspend(cpu_dai);
platform->suspend(&card->dai_link[i]);
}

/* close any waiting streams and save state */
Expand Down Expand Up @@ -943,7 +943,7 @@ static void soc_resume_deferred(struct work_struct *work)
if (cpu_dai->resume && !cpu_dai->ac97_control)
cpu_dai->resume(cpu_dai);
if (platform->resume)
platform->resume(cpu_dai);
platform->resume(&card->dai_link[i]);
}

if (card->resume_post)
Expand Down

0 comments on commit d273ebe

Please sign in to comment.