Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...

[karo-tx-linux.git] / sound / soc / intel / byt-rt5640.c

diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index dbc63d09f424f370ce29b6097e9cc15068b72aaf..53d160d399723aaf1537bd8987e51b92758dae74 100644 (file)
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -100,12 +100,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
        snd_soc_dapm_ignore_suspend(dapm, "SPORP");
        snd_soc_dapm_ignore_suspend(dapm, "SPORN");
 
-       snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-       snd_soc_dapm_enable_pin(dapm, "Headphone");
-       snd_soc_dapm_enable_pin(dapm, "Speaker");
-       snd_soc_dapm_enable_pin(dapm, "Internal Mic");
-
-       snd_soc_dapm_sync(dapm);
        return ret;
 }
 
@@ -138,43 +132,20 @@ 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;
-       struct device *dev = &pdev->dev;
 
        card->dev = &pdev->dev;
-       dev_set_drvdata(dev, card);
-       return snd_soc_register_card(card);
-}
-
-static int byt_rt5640_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_card(card);
-
-       return 0;
+       return devm_snd_soc_register_card(&pdev->dev, card);
 }
 
 static struct platform_driver byt_rt5640_audio = {
        .probe = byt_rt5640_probe,
-       .remove = byt_rt5640_remove,
        .driver = {
                .name = "byt-rt5640",
                .owner = THIS_MODULE,
-               .pm = BYT_RT5640_PM_OPS,
+               .pm = &snd_soc_pm_ops,
        },
 };
 module_platform_driver(byt_rt5640_audio)