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

ASoC: Use card rather than soc-audio device to card PM functions

Browse Source 
The platform device for the card is tied closely to the soc-audio
implementation which we're currently trying to remove in favour of
allowing cards to have their own devices. Begin removing it by
replacing it with the card in the suspend and resume callbacks we
give to cards, also taking the opportunity to remove the legacy
suspend types which are currently hard coded anyway.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown
2011-01-26 14:05:25 +00:00
parent 16af7d60aa
commit 70b2ac126a
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1011,7 +1011,7 @@ static int soc_suspend(struct device *dev)
}
if (card->suspend_pre)
card->suspend_pre(pdev, PMSG_SUSPEND);
card->suspend_pre(card);
for (i = 0; i < card->num_rtd; i++) {
struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
@ -1078,7 +1078,7 @@ static int soc_suspend(struct device *dev)
}
if (card->suspend_post)
card->suspend_post(pdev, PMSG_SUSPEND);
card->suspend_post(card);
return 0;
}
@ -1090,7 +1090,6 @@ static void soc_resume_deferred(struct work_struct *work)
{
struct snd_soc_card *card =
container_of(work, struct snd_soc_card, deferred_resume_work);
struct platform_device *pdev = to_platform_device(card->dev);
struct snd_soc_codec *codec;
int i;
@ -1104,7 +1103,7 @@ static void soc_resume_deferred(struct work_struct *work)
snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D2);
if (card->resume_pre)
card->resume_pre(pdev);
card->resume_pre(card);
/* resume AC97 DAIs */
for (i = 0; i < card->num_rtd; i++) {
@ -1179,7 +1178,7 @@ static void soc_resume_deferred(struct work_struct *work)
}
if (card->resume_post)
card->resume_post(pdev);
card->resume_post(card);
dev_dbg(card->dev, "resume work completed\n");