1 files changed, 10 insertions, 14 deletions

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index a1f9d30e162b..4e1bdb832e37 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -464,11 +464,10 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-
+#ifdef CONFIG_PM_SLEEP
 static u8 irqstat;
 
-static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+static int omap_rtc_suspend(struct device *dev)
 {
         irqstat = rtc_read(OMAP_RTC_INTERRUPTS_REG);
 
@@ -476,34 +475,32 @@ static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state)
          * source, and in fact this enable() call is just saving a flag
          * that's never used...
          */
-        if (device_may_wakeup(&pdev->dev))
+        if (device_may_wakeup(dev))
                 enable_irq_wake(omap_rtc_alarm);
         else
                 rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
 
         /* Disable the clock/module */
-        pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_put_sync(dev);
 
         return 0;
 }
 
-static int omap_rtc_resume(struct platform_device *pdev)
+static int omap_rtc_resume(struct device *dev)
 {
         /* Enable the clock/module so that we can access the registers */
-        pm_runtime_get_sync(&pdev->dev);
+        pm_runtime_get_sync(dev);
 
-        if (device_may_wakeup(&pdev->dev))
+        if (device_may_wakeup(dev))
                 disable_irq_wake(omap_rtc_alarm);
         else
                 rtc_write(irqstat, OMAP_RTC_INTERRUPTS_REG);
         return 0;
 }
-
-#else
-#define omap_rtc_suspend NULL
-#define omap_rtc_resume  NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);
+
 static void omap_rtc_shutdown(struct platform_device *pdev)
 {
         rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
@@ -512,12 +509,11 @@ static void omap_rtc_shutdown(struct platform_device *pdev)
 MODULE_ALIAS("platform:omap_rtc");
 static struct platform_driver omap_rtc_driver = {
         .remove         = __exit_p(omap_rtc_remove),
-        .suspend        = omap_rtc_suspend,
-        .resume         = omap_rtc_resume,
         .shutdown       = omap_rtc_shutdown,
         .driver         = {
                 .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
+                .pm     = &omap_rtc_pm_ops,
                 .of_match_table = of_match_ptr(omap_rtc_of_match),
         },
         .id_table       = omap_rtc_devtype,