diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-02 11:22:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-03 07:58:19 +0200 |
| commit | 284e7ca75f96a18f182cce38ba76ee724fb97e16 (patch) | |
| tree | c5dedd35372f9978e5f68d2c31a57ce6afdc0c87 /sound/ppc | |
| parent | 8bf01d8abc55eaf8e19a2d48911c8e49ee6f5bab (diff) | |
| download | op-kernel-dev-284e7ca75f96a18f182cce38ba76ee724fb97e16.zip op-kernel-dev-284e7ca75f96a18f182cce38ba76ee724fb97e16.tar.gz | |
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 aef54be..f5ceb6f 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) } #ifdef CONFIG_PM -static int snd_pmac_driver_suspend(struct platform_device *devptr, pm_message_t state) +static int snd_pmac_driver_suspend(struct device *dev) { - struct snd_card *card = platform_get_drvdata(devptr); + struct snd_card *card = dev_get_drvdata(dev); snd_pmac_suspend(card->private_data); return 0; } -static int snd_pmac_driver_resume(struct platform_device *devptr) +static int snd_pmac_driver_resume(struct device *dev) { - struct snd_card *card = platform_get_drvdata(devptr); + struct snd_card *card = dev_get_drvdata(dev); snd_pmac_resume(card->private_data); return 0; } + +static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_resume); +#define SND_PMAC_PM_OPS &snd_pmac_pm +#else +#define SND_PMAC_PM_OPS NULL #endif #define SND_PMAC_DRIVER "snd_powermac" @@ -164,13 +169,10 @@ static int snd_pmac_driver_resume(struct platform_device *devptr) static struct platform_driver snd_pmac_driver = { .probe = snd_pmac_probe, .remove = __devexit_p(snd_pmac_remove), -#ifdef CONFIG_PM - .suspend = snd_pmac_driver_suspend, - .resume = snd_pmac_driver_resume, -#endif .driver = { .name = SND_PMAC_DRIVER, .owner = THIS_MODULE, + .pm = SND_PMAC_PM_OPS, }, }; |
