ASoC: Intel: byt-rt5640: Use card PM ops from core
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Mon, 26 May 2014 13:56:33 +0000 (16:56 +0300)
committerMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 10:50:45 +0000 (11:50 +0100)
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>
sound/soc/intel/byt-rt5640.c

index eac6566f42e669503cb6ce1c8ecb89e2e222f680..ac52c77721b16931aff5892a93120eef5924533f 100644 (file)
@@ -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)