diff options
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 5ec5036df0bc..7e0a0887c256 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -327,7 +327,7 @@ static int sa1100_rtc_remove(struct platform_device *pdev) | |||
327 | return 0; | 327 | return 0; |
328 | } | 328 | } |
329 | 329 | ||
330 | #ifdef CONFIG_PM | 330 | #ifdef CONFIG_PM_SLEEP |
331 | static int sa1100_rtc_suspend(struct device *dev) | 331 | static int sa1100_rtc_suspend(struct device *dev) |
332 | { | 332 | { |
333 | struct sa1100_rtc *info = dev_get_drvdata(dev); | 333 | struct sa1100_rtc *info = dev_get_drvdata(dev); |
@@ -343,13 +343,11 @@ static int sa1100_rtc_resume(struct device *dev) | |||
343 | disable_irq_wake(info->irq_alarm); | 343 | disable_irq_wake(info->irq_alarm); |
344 | return 0; | 344 | return 0; |
345 | } | 345 | } |
346 | |||
347 | static const struct dev_pm_ops sa1100_rtc_pm_ops = { | ||
348 | .suspend = sa1100_rtc_suspend, | ||
349 | .resume = sa1100_rtc_resume, | ||
350 | }; | ||
351 | #endif | 346 | #endif |
352 | 347 | ||
348 | static SIMPLE_DEV_PM_OPS(sa1100_rtc_pm_ops, sa1100_rtc_suspend, | ||
349 | sa1100_rtc_resume); | ||
350 | |||
353 | #ifdef CONFIG_OF | 351 | #ifdef CONFIG_OF |
354 | static struct of_device_id sa1100_rtc_dt_ids[] = { | 352 | static struct of_device_id sa1100_rtc_dt_ids[] = { |
355 | { .compatible = "mrvl,sa1100-rtc", }, | 353 | { .compatible = "mrvl,sa1100-rtc", }, |
@@ -364,9 +362,7 @@ static struct platform_driver sa1100_rtc_driver = { | |||
364 | .remove = sa1100_rtc_remove, | 362 | .remove = sa1100_rtc_remove, |
365 | .driver = { | 363 | .driver = { |
366 | .name = "sa1100-rtc", | 364 | .name = "sa1100-rtc", |
367 | #ifdef CONFIG_PM | ||
368 | .pm = &sa1100_rtc_pm_ops, | 365 | .pm = &sa1100_rtc_pm_ops, |
369 | #endif | ||
370 | .of_match_table = of_match_ptr(sa1100_rtc_dt_ids), | 366 | .of_match_table = of_match_ptr(sa1100_rtc_dt_ids), |
371 | }, | 367 | }, |
372 | }; | 368 | }; |