mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
[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>
This commit is contained in:
parent
064d2112ff
commit
a55bfdc582
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user