iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ARM] pxa: update pxa2xx-ac97.c to use 'struct dev_pm_ops'

Browse Source 
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Mike Rapoport 2009-07-29 11:59:23 +03:00 committed by Eric Miao
parent 4f3edfe386
commit 2ba9fd0d15
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/arm/pxa2xx-ac97.c
View File

@ -137,9 +137,9 @@ static int pxa2xx_ac97_do_resume(struct snd_card *card)
return 0; return 0;
} }
static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state) static int pxa2xx_ac97_suspend(struct device *dev)
{ {
struct snd_card *card = platform_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
if (card) if (card)
@ -148,9 +148,9 @@ static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state)
return ret; return ret;
} }
static int pxa2xx_ac97_resume(struct platform_device *dev) static int pxa2xx_ac97_resume(struct device *dev)
{ {
struct snd_card *card = platform_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
if (card) if (card)
@ -159,9 +159,10 @@ static int pxa2xx_ac97_resume(struct platform_device *dev)
return ret; return ret;
} }
#else static struct dev_pm_ops pxa2xx_ac97_pm_ops = {
#define pxa2xx_ac97_suspend NULL .suspend = pxa2xx_ac97_suspend,
#define pxa2xx_ac97_resume NULL .resume = pxa2xx_ac97_resume,
};
#endif #endif
static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
@ -231,11 +232,12 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
static struct platform_driver pxa2xx_ac97_driver = { static struct platform_driver pxa2xx_ac97_driver = {
.probe = pxa2xx_ac97_probe, .probe = pxa2xx_ac97_probe,
.remove = __devexit_p(pxa2xx_ac97_remove), .remove = __devexit_p(pxa2xx_ac97_remove),
.suspend = pxa2xx_ac97_suspend,
.resume = pxa2xx_ac97_resume,
.driver = { .driver = {
.name = "pxa2xx-ac97", .name = "pxa2xx-ac97",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pxa2xx_ac97_pm_ops,
#endif
}, },
}; };