summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-05-26 16:56:33 +0300
committerMark Brown <broonie@linaro.org>2014-06-01 11:50:45 +0100
commit4af72f4e6911a0bfd51c5a806c3a8642a9c4665e (patch)
treed5f1e20cc2a6e7fd58b03846a75cc8d7a405be58 /sound/soc
parent8eb776ab17232b02d915b90f5dd14c45af86c3a0 (diff)
downloadlinux-4af72f4e6911a0bfd51c5a806c3a8642a9c4665e.tar.bz2
ASoC: Intel: byt-rt5640: Use card PM ops from core
Use card PM ops from ASoC core instead of defining custom PM ops here since we are calling anyway common suspend/resume callbacks. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/byt-rt5640.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index eac6566f42e6..ac52c77721b1 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -138,17 +138,6 @@ static struct snd_soc_card byt_rt5640_card = {
.num_dapm_routes = ARRAY_SIZE(byt_rt5640_audio_map),
};
-#ifdef CONFIG_PM_SLEEP
-static const struct dev_pm_ops byt_rt5640_pm_ops = {
- .suspend = snd_soc_suspend,
- .resume = snd_soc_resume,
-};
-
-#define BYT_RT5640_PM_OPS (&byt_rt5640_pm_ops)
-#else
-#define BYT_RT5640_PM_OPS NULL
-#endif
-
static int byt_rt5640_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &byt_rt5640_card;
@@ -162,7 +151,7 @@ static struct platform_driver byt_rt5640_audio = {
.driver = {
.name = "byt-rt5640",
.owner = THIS_MODULE,
- .pm = BYT_RT5640_PM_OPS,
+ .pm = &snd_soc_pm_ops,
},
};
module_platform_driver(byt_rt5640_audio)