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/drivers/dummy.c | |
| 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/drivers/dummy.c')
| -rw-r--r-- | sound/drivers/dummy.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index bc79c44..f7d3bfc 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -1065,9 +1065,9 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr) } #ifdef CONFIG_PM -static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state) +static int snd_dummy_suspend(struct device *pdev) { - struct snd_card *card = platform_get_drvdata(pdev); + struct snd_card *card = dev_get_drvdata(pdev); struct snd_dummy *dummy = card->private_data; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); @@ -1075,13 +1075,18 @@ static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state) return 0; } -static int snd_dummy_resume(struct platform_device *pdev) +static int snd_dummy_resume(struct device *pdev) { - struct snd_card *card = platform_get_drvdata(pdev); + struct snd_card *card = dev_get_drvdata(pdev); snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } + +static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume); +#define SND_DUMMY_PM_OPS &snd_dummy_pm +#else +#define SND_DUMMY_PM_OPS NULL #endif #define SND_DUMMY_DRIVER "snd_dummy" @@ -1089,13 +1094,10 @@ static int snd_dummy_resume(struct platform_device *pdev) static struct platform_driver snd_dummy_driver = { .probe = snd_dummy_probe, .remove = __devexit_p(snd_dummy_remove), -#ifdef CONFIG_PM - .suspend = snd_dummy_suspend, - .resume = snd_dummy_resume, -#endif .driver = { .name = SND_DUMMY_DRIVER, .owner = THIS_MODULE, + .pm = SND_DUMMY_PM_OPS, }, }; |
