[PORT FROM R2] alarm: Migrate legacy suspend/resume to dev_pm_ops

BZ: 2881

alarm driver uses legacy suspend/resume callbacks. Migrate them to
dev_pm_ops

Orig-Change-Id: I698c5d2112658dac6836963758c0b7fcd8e4d57e
Signed-off-by: MingmingX Zhang <mingmingx.zhang@intel.com>
Conflicts:

	drivers/rtc/alarm.c

Change-Id: I2c5f453d1b36493390e24bef1ce87f4d3d7fe11a
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/32684
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index 5576e90..68fa476 100644 (file)
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -370,7 +370,7 @@ static void alarm_triggered_func(void *p)
        wake_lock_timeout(&alarm_rtc_wake_lock, 1 * HZ);
 }
 
-static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
+static int alarm_suspend(struct device *dev)
 {
        int                 err = 0;
        unsigned long       flags;
@@ -383,8 +383,6 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
        struct alarm_queue *wakeup_queue = NULL;
        struct alarm_queue *tmp_queue = NULL;
 
-       pr_alarm(SUSPEND, "alarm_suspend(%p, %d)\n", pdev, state.event);
-
        spin_lock_irqsave(&alarm_slock, flags);
        suspended = true;
        spin_unlock_irqrestore(&alarm_slock, flags);
@@ -442,12 +440,12 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
        return err;
 }
 
-static int alarm_resume(struct platform_device *pdev)
+static int alarm_resume(struct device *dev)
 {
        struct rtc_wkalrm alarm;
        unsigned long       flags;
 
-       pr_alarm(SUSPEND, "alarm_resume(%p)\n", pdev);
+       pr_alarm(SUSPEND, "alarm_resume(%p)\n", dev);
 
        memset(&alarm, 0, sizeof(alarm));
        alarm.enabled = 0;
@@ -519,12 +517,15 @@ static struct class_interface rtc_alarm_interface = {
        .remove_dev = &rtc_alarm_remove_device,
 };
 
-static struct platform_driver alarm_driver = {
+static const struct dev_pm_ops alarm_pm_ops = {
        .suspend = alarm_suspend,
        .resume = alarm_resume,
+};
+static struct platform_driver alarm_driver = {
        .driver = {
-               .name = "alarm"
-       }
+               .name = "alarm",
+               .pm = &alarm_pm_ops,
+       },
 };
 
 static int __init alarm_late_init(void)