Merge Paulus' tree

[karo-tx-linux.git] / sound / arm / pxa2xx-ac97.c

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 29450befb5da52b59680f7624d766897703d6d3c..d1f9da498729c96040a477311e7c67cc94d3fc99 100644 (file)
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
@@ -245,7 +245,7 @@ static pxa2xx_pcm_client_t pxa2xx_ac97_pcm_client = {
 
 #ifdef CONFIG_PM
 
-static int pxa2xx_ac97_do_suspend(snd_card_t *card, unsigned int state)
+static int pxa2xx_ac97_do_suspend(snd_card_t *card, pm_message_t state)
 {
        if (card->power_state != SNDRV_CTL_POWER_D3cold) {
                pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
@@ -275,23 +275,23 @@ static int pxa2xx_ac97_do_resume(snd_card_t *card)
        return 0;
 }
 
-static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state)
 {
        snd_card_t *card = dev_get_drvdata(_dev);
        int ret = 0;
 
-       if (card && level == SUSPEND_DISABLE)
+       if (card)
                ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
 
        return ret;
 }
 
-static int pxa2xx_ac97_resume(struct device *_dev, u32 level)
+static int pxa2xx_ac97_resume(struct device *_dev)
 {
        snd_card_t *card = dev_get_drvdata(_dev);
        int ret = 0;
 
-       if (card && level == RESUME_ENABLE)
+       if (card)
                ret = pxa2xx_ac97_do_resume(card);
 
        return ret;