[v2,1/4] ASoC: Intel: Revert "ASoC: Intel: Add support for PM ops in bxt-rt298"

Commit Message

Vinod Koul June 22, 2016, 2:14 p.m. UTC

This reverts commit 3513798ca4bc ("ASoC: Intel: Add support for
PM ops in bxt-rt298") as the right way to fix this is to disable
async suspend

Signed-off-by: Vinod Koul <[e-mail]>
---
 sound/soc/intel/boards/bxt_rt298.c | 23 -----------------------
 1 file changed, 23 deletions(-)

Patch

diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index 2ef33b113bb5..8b956500414b 100644
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -454,33 +454,10 @@  static int broxton_audio_probe(struct platform_device *pdev)
 	return devm_snd_soc_register_card(&pdev->dev, &broxton_rt298);
 }
 
-/*
- * we want the card to be suspend first and then platform driver. This
- * allows the DAPM to tear down pipelines on suspend and then platform shuts
- * down the DSP. For this use .prepare for suspending card
- *
- * Similarly, use complete to let DSP download firmware first and then sync
- * DAPM and restore pipelines to DSP
- */
-static void broxton_rt298_complete(struct device *dev)
-{
-	snd_soc_resume(dev);
-}
-
-static const struct dev_pm_ops broxton_pm_ops = {
-	.prepare = snd_soc_suspend,
-	.complete = broxton_rt298_complete,
-	.freeze = snd_soc_suspend,
-	.thaw = snd_soc_resume,
-	.poweroff = snd_soc_poweroff,
-	.restore = snd_soc_resume,
-};
-
 static struct platform_driver broxton_audio = {
 	.probe = broxton_audio_probe,
 	.driver = {
 		.name = "bxt_alc298s_i2s",
-		.pm = &broxton_pm_ops,
 	},
 };
 module_platform_driver(broxton_audio)