diff options
| author | Mike Rapoport <mike@compulab.co.il> | 2009-07-29 11:59:23 +0300 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-09-10 19:15:37 +0800 |
| commit | 2ba9fd0d15c088aae31ec0d672153610212e9e34 (patch) | |
| tree | 6bbdf1e9ca1ac2163feaa8c8be43fe2f5c17cadb /sound/arm | |
| parent | 4f3edfe386da66558577fa636e4b33696497743e (diff) | |
| download | kernel_samsung_smdk4412-2ba9fd0d15c088aae31ec0d672153610212e9e34.tar.gz kernel_samsung_smdk4412-2ba9fd0d15c088aae31ec0d672153610212e9e34.tar.bz2 kernel_samsung_smdk4412-2ba9fd0d15c088aae31ec0d672153610212e9e34.zip | |
[ARM] pxa: update pxa2xx-ac97.c to use 'struct dev_pm_ops'
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index c570ebd9d17..9c12563db1c 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -137,9 +137,9 @@ static int pxa2xx_ac97_do_resume(struct snd_card *card) 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; if (card) @@ -148,9 +148,9 @@ static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state) 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; if (card) @@ -159,9 +159,10 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) return ret; } -#else -#define pxa2xx_ac97_suspend NULL -#define pxa2xx_ac97_resume NULL +static struct dev_pm_ops pxa2xx_ac97_pm_ops = { + .suspend = pxa2xx_ac97_suspend, + .resume = pxa2xx_ac97_resume, +}; #endif 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 = { .probe = pxa2xx_ac97_probe, .remove = __devexit_p(pxa2xx_ac97_remove), - .suspend = pxa2xx_ac97_suspend, - .resume = pxa2xx_ac97_resume, .driver = { .name = "pxa2xx-ac97", .owner = THIS_MODULE, +#ifdef CONFIG_PM + .pm = &pxa2xx_ac97_pm_ops, +#endif }, }; |