ALSA: convert PM ops of platform_driver to new pm ops

[deliverable/linux.git] / sound / drivers / dummy.c

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index ad9434fd6370d87afef124954b6a0adb56736354..f7d3bfc6bca83ed296a59fb059cd79ea364c6879 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -1065,9 +1065,9 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr)
 }
 
 #ifdef CONFIG_PM
-static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state)
+static int snd_dummy_suspend(struct device *pdev)
 {
-       struct snd_card *card = platform_get_drvdata(pdev);
+       struct snd_card *card = dev_get_drvdata(pdev);
        struct snd_dummy *dummy = card->private_data;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
@@ -1075,13 +1075,18 @@ static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state)
        return 0;
 }
        
-static int snd_dummy_resume(struct platform_device *pdev)
+static int snd_dummy_resume(struct device *pdev)
 {
-       struct snd_card *card = platform_get_drvdata(pdev);
+       struct snd_card *card = dev_get_drvdata(pdev);
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
        return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);
+#define SND_DUMMY_PM_OPS       &snd_dummy_pm
+#else
+#define SND_DUMMY_PM_OPS       NULL
 #endif
 
 #define SND_DUMMY_DRIVER       "snd_dummy"
@@ -1089,12 +1094,10 @@ static int snd_dummy_resume(struct platform_device *pdev)
 static struct platform_driver snd_dummy_driver = {
        .probe          = snd_dummy_probe,
        .remove         = __devexit_p(snd_dummy_remove),
-#ifdef CONFIG_PM
-       .suspend        = snd_dummy_suspend,
-       .resume         = snd_dummy_resume,
-#endif
        .driver         = {
-               .name   = SND_DUMMY_DRIVER
+               .name   = SND_DUMMY_DRIVER,
+               .owner  = THIS_MODULE,
+               .pm     = SND_DUMMY_PM_OPS,
        },
 };