1 files changed, 3 insertions, 6 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index afef72c4f0d3..0d7b25e81643 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -108,7 +108,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {
 
 #ifdef CONFIG_PM
 
-static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)
+static int pxa2xx_ac97_do_suspend(struct snd_card *card)
 {
         pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
 
@@ -144,7 +144,7 @@ static int pxa2xx_ac97_suspend(struct device *dev)
         int ret = 0;
 
         if (card)
-                ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
+                ret = pxa2xx_ac97_do_suspend(card);
 
         return ret;
 }
@@ -160,10 +160,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
         return ret;
 }
 
-static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {
-        .suspend        = pxa2xx_ac97_suspend,
-        .resume         = pxa2xx_ac97_resume,
-};
+static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
 #endif
 
 static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)