diff options
| author | Dirk Opfer <dirk@do13.de> | 2005-08-08 10:29:43 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 02:44:29 -0400 |
| commit | a55bfdc5821df787068da15a6864f2c669d7d22c (patch) | |
| tree | 8ac7b469e58d05efdbc5e3c8ebf873a82581450b | |
| parent | 064d2112ff24937f9aabb6baae8de88b6e5ef453 (diff) | |
[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>
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 8 |
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) | |||
| 261 | return 0; | 261 | return 0; |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | static int pxa2xx_ac97_do_resume(snd_card_t *card, unsigned int state) | 264 | static int pxa2xx_ac97_do_resume(snd_card_t *card) |
| 265 | { | 265 | { |
| 266 | if (card->power_state != SNDRV_CTL_POWER_D0) { | 266 | if (card->power_state != SNDRV_CTL_POWER_D0) { |
| 267 | pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data; | 267 | 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) | |||
| 275 | return 0; | 275 | return 0; |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | static int pxa2xx_ac97_suspend(struct device *_dev, u32 state, u32 level) | 278 | static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state, u32 level) |
| 279 | { | 279 | { |
| 280 | snd_card_t *card = dev_get_drvdata(_dev); | 280 | snd_card_t *card = dev_get_drvdata(_dev); |
| 281 | int ret = 0; | 281 | int ret = 0; |
| 282 | 282 | ||
| 283 | if (card && level == SUSPEND_DISABLE) | 283 | if (card && level == SUSPEND_DISABLE) |
| 284 | ret = pxa2xx_ac97_do_suspend(card, SNDRV_CTL_POWER_D3cold); | 284 | ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND); |
| 285 | 285 | ||
| 286 | return ret; | 286 | return ret; |
| 287 | } | 287 | } |
| @@ -292,7 +292,7 @@ static int pxa2xx_ac97_resume(struct device *_dev, u32 level) | |||
| 292 | int ret = 0; | 292 | int ret = 0; |
| 293 | 293 | ||
| 294 | if (card && level == RESUME_ENABLE) | 294 | if (card && level == RESUME_ENABLE) |
| 295 | ret = pxa2xx_ac97_do_resume(card, SNDRV_CTL_POWER_D0); | 295 | ret = pxa2xx_ac97_do_resume(card); |
| 296 | 296 | ||
| 297 | return ret; | 297 | return ret; |
| 298 | } | 298 | } |
