aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-26 09:05:25 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-27 06:55:53 -0500
commit70b2ac126a60c87145ae8a8eb1b4dccaa0bf5468 (patch)
tree314a435bc3753194b6abcf63ce7721810729f841 /include/sound
parent16af7d60aa27d3fc39e46fd456b8e33d34d60437 (diff)
ASoC: Use card rather than soc-audio device to card PM functions
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>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 1355ef029d82..4a489ae44a6e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -654,10 +654,10 @@ struct snd_soc_card {
654 654
655 /* the pre and post PM functions are used to do any PM work before and 655 /* the pre and post PM functions are used to do any PM work before and
656 * after the codec and DAI's do any PM work. */ 656 * after the codec and DAI's do any PM work. */
657 int (*suspend_pre)(struct platform_device *pdev, pm_message_t state); 657 int (*suspend_pre)(struct snd_soc_card *card);
658 int (*suspend_post)(struct platform_device *pdev, pm_message_t state); 658 int (*suspend_post)(struct snd_soc_card *card);
659 int (*resume_pre)(struct platform_device *pdev); 659 int (*resume_pre)(struct snd_soc_card *card);
660 int (*resume_post)(struct platform_device *pdev); 660 int (*resume_post)(struct snd_soc_card *card);
661 661
662 /* callbacks */ 662 /* callbacks */
663 int (*set_bias_level)(struct snd_soc_card *, 663 int (*set_bias_level)(struct snd_soc_card *,