diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:30 -0400 |
| commit | 28f9f19db9dda54c851d5689539d86f6fc008773 (patch) | |
| tree | 469f5d7b24871b6fe001b7ad9acac859405f4822 /sound | |
| parent | 40262b2b6efac507005a2c981175266bf81152a7 (diff) | |
| parent | 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'sound')
| -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 4e34d19ddbc0..b4b48afb6de6 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) | |||
| 137 | return 0; | 137 | return 0; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state) | 140 | static int pxa2xx_ac97_suspend(struct device *dev) |
| 141 | { | 141 | { |
| 142 | struct snd_card *card = platform_get_drvdata(dev); | 142 | struct snd_card *card = dev_get_drvdata(dev); |
| 143 | int ret = 0; | 143 | int ret = 0; |
| 144 | 144 | ||
| 145 | if (card) | 145 | if (card) |
| @@ -148,9 +148,9 @@ static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state) | |||
| 148 | return ret; | 148 | return ret; |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | static int pxa2xx_ac97_resume(struct platform_device *dev) | 151 | static int pxa2xx_ac97_resume(struct device *dev) |
| 152 | { | 152 | { |
| 153 | struct snd_card *card = platform_get_drvdata(dev); | 153 | struct snd_card *card = dev_get_drvdata(dev); |
| 154 | int ret = 0; | 154 | int ret = 0; |
| 155 | 155 | ||
| 156 | if (card) | 156 | if (card) |
| @@ -159,9 +159,10 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) | |||
| 159 | return ret; | 159 | return ret; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | #else | 162 | static struct dev_pm_ops pxa2xx_ac97_pm_ops = { |
| 163 | #define pxa2xx_ac97_suspend NULL | 163 | .suspend = pxa2xx_ac97_suspend, |
| 164 | #define pxa2xx_ac97_resume NULL | 164 | .resume = pxa2xx_ac97_resume, |
| 165 | }; | ||
| 165 | #endif | 166 | #endif |
| 166 | 167 | ||
| 167 | static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) | 168 | static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) |
| @@ -241,11 +242,12 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev) | |||
| 241 | static struct platform_driver pxa2xx_ac97_driver = { | 242 | static struct platform_driver pxa2xx_ac97_driver = { |
| 242 | .probe = pxa2xx_ac97_probe, | 243 | .probe = pxa2xx_ac97_probe, |
| 243 | .remove = __devexit_p(pxa2xx_ac97_remove), | 244 | .remove = __devexit_p(pxa2xx_ac97_remove), |
| 244 | .suspend = pxa2xx_ac97_suspend, | ||
| 245 | .resume = pxa2xx_ac97_resume, | ||
| 246 | .driver = { | 245 | .driver = { |
| 247 | .name = "pxa2xx-ac97", | 246 | .name = "pxa2xx-ac97", |
| 248 | .owner = THIS_MODULE, | 247 | .owner = THIS_MODULE, |
| 248 | #ifdef CONFIG_PM | ||
| 249 | .pm = &pxa2xx_ac97_pm_ops, | ||
| 250 | #endif | ||
| 249 | }, | 251 | }, |
| 250 | }; | 252 | }; |
| 251 | 253 | ||