aboutsummaryrefslogtreecommitdiffstats
path: root/sound/atmel/ac97c.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-07-02 05:22:40 -0400
committerTakashi Iwai <tiwai@suse.de>2012-07-03 01:58:19 -0400
commit284e7ca75f96a18f182cce38ba76ee724fb97e16 (patch)
treec5dedd35372f9978e5f68d2c31a57ce6afdc0c87 /sound/atmel/ac97c.c
parent8bf01d8abc55eaf8e19a2d48911c8e49ee6f5bab (diff)
ALSA: convert PM ops of platform_driver to new pm ops
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/atmel/ac97c.c')
-rw-r--r--sound/atmel/ac97c.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 3d0ea82ff068..bf47025bdf45 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -1135,9 +1135,9 @@ err_snd_card_new:
1135} 1135}
1136 1136
1137#ifdef CONFIG_PM 1137#ifdef CONFIG_PM
1138static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg) 1138static int atmel_ac97c_suspend(struct device *pdev)
1139{ 1139{
1140 struct snd_card *card = platform_get_drvdata(pdev); 1140 struct snd_card *card = dev_get_drvdata(pdev);
1141 struct atmel_ac97c *chip = card->private_data; 1141 struct atmel_ac97c *chip = card->private_data;
1142 1142
1143 if (cpu_is_at32ap7000()) { 1143 if (cpu_is_at32ap7000()) {
@@ -1151,9 +1151,9 @@ static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg)
1151 return 0; 1151 return 0;
1152} 1152}
1153 1153
1154static int atmel_ac97c_resume(struct platform_device *pdev) 1154static int atmel_ac97c_resume(struct device *pdev)
1155{ 1155{
1156 struct snd_card *card = platform_get_drvdata(pdev); 1156 struct snd_card *card = dev_get_drvdata(pdev);
1157 struct atmel_ac97c *chip = card->private_data; 1157 struct atmel_ac97c *chip = card->private_data;
1158 1158
1159 clk_enable(chip->pclk); 1159 clk_enable(chip->pclk);
@@ -1165,9 +1165,11 @@ static int atmel_ac97c_resume(struct platform_device *pdev)
1165 } 1165 }
1166 return 0; 1166 return 0;
1167} 1167}
1168
1169static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume);
1170#define ATMEL_AC97C_PM_OPS &atmel_ac97c_pm
1168#else 1171#else
1169#define atmel_ac97c_suspend NULL 1172#define ATMEL_AC97C_PM_OPS NULL
1170#define atmel_ac97c_resume NULL
1171#endif 1173#endif
1172 1174
1173static int __devexit atmel_ac97c_remove(struct platform_device *pdev) 1175static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
@@ -1211,9 +1213,8 @@ static struct platform_driver atmel_ac97c_driver = {
1211 .driver = { 1213 .driver = {
1212 .name = "atmel_ac97c", 1214 .name = "atmel_ac97c",
1213 .owner = THIS_MODULE, 1215 .owner = THIS_MODULE,
1216 .pm = ATMEL_AC97C_PM_OPS,
1214 }, 1217 },
1215 .suspend = atmel_ac97c_suspend,
1216 .resume = atmel_ac97c_resume,
1217}; 1218};
1218 1219
1219static int __init atmel_ac97c_init(void) 1220static int __init atmel_ac97c_init(void)