projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
sound
/
arm
/
pxa2xx-ac97.c
diff --git
a/sound/arm/pxa2xx-ac97.c
b/sound/arm/pxa2xx-ac97.c
index
29450be
..
877bb00
100644
(file)
--- a/
sound/arm/pxa2xx-ac97.c
+++ b/
sound/arm/pxa2xx-ac97.c
@@
-245,7
+245,7
@@
static pxa2xx_pcm_client_t pxa2xx_ac97_pcm_client = {
#ifdef CONFIG_PM
#ifdef CONFIG_PM
-static int pxa2xx_ac97_do_suspend(snd_card_t *card,
unsigned in
t state)
+static int pxa2xx_ac97_do_suspend(snd_card_t *card,
pm_message_
t state)
{
if (card->power_state != SNDRV_CTL_POWER_D3cold) {
pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
{
if (card->power_state != SNDRV_CTL_POWER_D3cold) {
pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
@@
-275,23
+275,23
@@
static int pxa2xx_ac97_do_resume(snd_card_t *card)
return 0;
}
return 0;
}
-static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state
, u32 level
)
+static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state)
{
snd_card_t *card = dev_get_drvdata(_dev);
int ret = 0;
{
snd_card_t *card = dev_get_drvdata(_dev);
int ret = 0;
- if (card
&& level == SUSPEND_DISABLE
)
+ if (card)
ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
return ret;
}
ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
return ret;
}
-static int pxa2xx_ac97_resume(struct device *_dev
, u32 level
)
+static int pxa2xx_ac97_resume(struct device *_dev)
{
snd_card_t *card = dev_get_drvdata(_dev);
int ret = 0;
{
snd_card_t *card = dev_get_drvdata(_dev);
int ret = 0;
- if (card
&& level == RESUME_ENABLE
)
+ if (card)
ret = pxa2xx_ac97_do_resume(card);
return ret;
ret = pxa2xx_ac97_do_resume(card);
return ret;