diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-07-02 05:22:40 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-03 01:58:19 -0400 |
commit | 284e7ca75f96a18f182cce38ba76ee724fb97e16 (patch) | |
tree | c5dedd35372f9978e5f68d2c31a57ce6afdc0c87 /sound/ppc | |
parent | 8bf01d8abc55eaf8e19a2d48911c8e49ee6f5bab (diff) |
ALSA: convert PM ops of platform_driver to new pm ops
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/powermac.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index aef54beaf8b7..f5ceb6f282de 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c | |||
@@ -144,19 +144,24 @@ static int __devexit snd_pmac_remove(struct platform_device *devptr) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | #ifdef CONFIG_PM | 146 | #ifdef CONFIG_PM |
147 | static int snd_pmac_driver_suspend(struct platform_device *devptr, pm_message_t state) | 147 | static int snd_pmac_driver_suspend(struct device *dev) |
148 | { | 148 | { |
149 | struct snd_card *card = platform_get_drvdata(devptr); | 149 | struct snd_card *card = dev_get_drvdata(dev); |
150 | snd_pmac_suspend(card->private_data); | 150 | snd_pmac_suspend(card->private_data); |
151 | return 0; | 151 | return 0; |
152 | } | 152 | } |
153 | 153 | ||
154 | static int snd_pmac_driver_resume(struct platform_device *devptr) | 154 | static int snd_pmac_driver_resume(struct device *dev) |
155 | { | 155 | { |
156 | struct snd_card *card = platform_get_drvdata(devptr); | 156 | struct snd_card *card = dev_get_drvdata(dev); |
157 | snd_pmac_resume(card->private_data); | 157 | snd_pmac_resume(card->private_data); |
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | |||
161 | static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_resume); | ||
162 | #define SND_PMAC_PM_OPS &snd_pmac_pm | ||
163 | #else | ||
164 | #define SND_PMAC_PM_OPS NULL | ||
160 | #endif | 165 | #endif |
161 | 166 | ||
162 | #define SND_PMAC_DRIVER "snd_powermac" | 167 | #define SND_PMAC_DRIVER "snd_powermac" |
@@ -164,13 +169,10 @@ static int snd_pmac_driver_resume(struct platform_device *devptr) | |||
164 | static struct platform_driver snd_pmac_driver = { | 169 | static struct platform_driver snd_pmac_driver = { |
165 | .probe = snd_pmac_probe, | 170 | .probe = snd_pmac_probe, |
166 | .remove = __devexit_p(snd_pmac_remove), | 171 | .remove = __devexit_p(snd_pmac_remove), |
167 | #ifdef CONFIG_PM | ||
168 | .suspend = snd_pmac_driver_suspend, | ||
169 | .resume = snd_pmac_driver_resume, | ||
170 | #endif | ||
171 | .driver = { | 172 | .driver = { |
172 | .name = SND_PMAC_DRIVER, | 173 | .name = SND_PMAC_DRIVER, |
173 | .owner = THIS_MODULE, | 174 | .owner = THIS_MODULE, |
175 | .pm = SND_PMAC_PM_OPS, | ||
174 | }, | 176 | }, |
175 | }; | 177 | }; |
176 | 178 | ||