ALSA: convert PM ops of platform_driver to new pm ops
Signed-off-by: Takashi Iwai <tiwai@suse.de>
这个提交包含在:
@@ -1177,10 +1177,9 @@ static int __devexit loopback_remove(struct platform_device *devptr)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int loopback_suspend(struct platform_device *pdev,
|
||||
pm_message_t state)
|
||||
static int loopback_suspend(struct device *pdev)
|
||||
{
|
||||
struct snd_card *card = platform_get_drvdata(pdev);
|
||||
struct snd_card *card = dev_get_drvdata(pdev);
|
||||
struct loopback *loopback = card->private_data;
|
||||
|
||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||
@@ -1190,13 +1189,18 @@ static int loopback_suspend(struct platform_device *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int loopback_resume(struct platform_device *pdev)
|
||||
static int loopback_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(loopback_pm, loopback_suspend, loopback_resume);
|
||||
#define LOOPBACK_PM_OPS &loopback_pm
|
||||
#else
|
||||
#define LOOPBACK_PM_OPS NULL
|
||||
#endif
|
||||
|
||||
#define SND_LOOPBACK_DRIVER "snd_aloop"
|
||||
@@ -1204,13 +1208,10 @@ static int loopback_resume(struct platform_device *pdev)
|
||||
static struct platform_driver loopback_driver = {
|
||||
.probe = loopback_probe,
|
||||
.remove = __devexit_p(loopback_remove),
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = loopback_suspend,
|
||||
.resume = loopback_resume,
|
||||
#endif
|
||||
.driver = {
|
||||
.name = SND_LOOPBACK_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
.pm = LOOPBACK_PM_OPS,
|
||||
},
|
||||
};
|
||||
|
||||
|
@@ -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,
|
||||
},
|
||||
};
|
||||
|
||||
|
@@ -200,15 +200,18 @@ static void pcsp_stop_beep(struct snd_pcsp *chip)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int pcsp_suspend(struct platform_device *dev, pm_message_t state)
|
||||
static int pcsp_suspend(struct device *dev)
|
||||
{
|
||||
struct snd_pcsp *chip = platform_get_drvdata(dev);
|
||||
struct snd_pcsp *chip = dev_get_drvdata(dev);
|
||||
pcsp_stop_beep(chip);
|
||||
snd_pcm_suspend_all(chip->pcm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(pcsp_pm, pcsp_suspend, NULL);
|
||||
#define PCSP_PM_OPS &pcsp_pm
|
||||
#else
|
||||
#define pcsp_suspend NULL
|
||||
#define PCSP_PM_OPS NULL
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static void pcsp_shutdown(struct platform_device *dev)
|
||||
@@ -221,10 +224,10 @@ static struct platform_driver pcsp_platform_driver = {
|
||||
.driver = {
|
||||
.name = "pcspkr",
|
||||
.owner = THIS_MODULE,
|
||||
.pm = PCSP_PM_OPS,
|
||||
},
|
||||
.probe = pcsp_probe,
|
||||
.remove = __devexit_p(pcsp_remove),
|
||||
.suspend = pcsp_suspend,
|
||||
.shutdown = pcsp_shutdown,
|
||||
};
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户