summaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorDirk Opfer <dirk@do13.de>2005-08-08 16:29:43 +0200
committerJaroslav Kysela <perex@suse.cz>2005-08-30 08:44:29 +0200
commita55bfdc5821df787068da15a6864f2c669d7d22c (patch)
tree8ac7b469e58d05efdbc5e3c8ebf873a82581450b /sound/arm
parent064d2112ff24937f9aabb6baae8de88b6e5ef453 (diff)
downloadblackbird-op-linux-a55bfdc5821df787068da15a6864f2c669d7d22c.tar.gz
blackbird-op-linux-a55bfdc5821df787068da15a6864f2c669d7d22c.zip
[ALSA] Fix compiler warnings in PXA2XX-AC97
ARM PXA2XX driver - change pxa2xx_ac97_do_suspend and pxa2xx_ac97_do_resume to use the expected arguments Signed-off-by: Dirk Opfer <dirk@do13.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/pxa2xx-ac97.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index b605a24946a3..29450befb5da 100644
--- 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;
}
OpenPOWER on IntegriCloud