[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

[linux-2.6] / sound / arm / pxa2xx-ac97.c

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index b605a24946a3dbdb1de263752f0a77bdc5c4a382..29450befb5da52b59680f7624d766897703d6d3c 100644 (file)
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -261,7 +261,7 @@ static int pxa2xx_ac97_do_suspend(snd_card_t *card, unsigned int state)
        return 0;
 }
 
-static int pxa2xx_ac97_do_resume(snd_card_t *card, unsigned int state)
+static int pxa2xx_ac97_do_resume(snd_card_t *card)
 {
        if (card->power_state != SNDRV_CTL_POWER_D0) {
                pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
@@ -275,13 +275,13 @@ static int pxa2xx_ac97_do_resume(snd_card_t *card, unsigned int state)
        return 0;
 }
 
-static int pxa2xx_ac97_suspend(struct device *_dev, u32 state, u32 level)
+static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state, u32 level)
 {
        snd_card_t *card = dev_get_drvdata(_dev);
        int ret = 0;
 
        if (card && level == SUSPEND_DISABLE)
-               ret = pxa2xx_ac97_do_suspend(card, SNDRV_CTL_POWER_D3cold);
+               ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
 
        return ret;
 }
@@ -292,7 +292,7 @@ static int pxa2xx_ac97_resume(struct device *_dev, u32 level)
        int ret = 0;
 
        if (card && level == RESUME_ENABLE)
-               ret = pxa2xx_ac97_do_resume(card, SNDRV_CTL_POWER_D0);
+               ret = pxa2xx_ac97_do_resume(card);
 
        return ret;
 }