Skip to content

Commit

Permalink
[ALSA] Fix compiler warnings in PXA2XX-AC97
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dirk Opfer authored and Jaroslav Kysela committed Aug 30, 2005
1 parent 064d211 commit a55bfdc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/arm/pxa2xx-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit a55bfdc

Please sign in to comment.