rtc: snvs: use dev_pm_set_wake_irq() to simplify code

[linux-2.6-block.git] / drivers / rtc / rtc-snvs.c

diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c
index 0b9eff19149b13ee2537b0c62088de013dc7eec5..ce73eab76f36bb28ac9d227719549b94a7b3e1a7 100644 (file)
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@ -9,6 +9,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/pm_wakeirq.h>
 #include <linux/rtc.h>
 #include <linux/clk.h>
 #include <linux/mfd/syscon.h>
@@ -332,6 +333,9 @@ static int snvs_rtc_probe(struct platform_device *pdev)
        }
 
        device_init_wakeup(&pdev->dev, true);
+       ret = dev_pm_set_wake_irq(&pdev->dev, data->irq);
+       if (ret)
+               dev_err(&pdev->dev, "failed to enable irq wake\n");
 
        ret = devm_request_irq(&pdev->dev, data->irq, snvs_rtc_irq_handler,
                               IRQF_SHARED, "rtc alarm", &pdev->dev);
@@ -359,15 +363,6 @@ error_rtc_device_register:
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int snvs_rtc_suspend(struct device *dev)
-{
-       struct snvs_rtc_data *data = dev_get_drvdata(dev);
-
-       if (device_may_wakeup(dev))
-               return enable_irq_wake(data->irq);
-
-       return 0;
-}
 
 static int snvs_rtc_suspend_noirq(struct device *dev)
 {
@@ -379,16 +374,6 @@ static int snvs_rtc_suspend_noirq(struct device *dev)
        return 0;
 }
 
-static int snvs_rtc_resume(struct device *dev)
-{
-       struct snvs_rtc_data *data = dev_get_drvdata(dev);
-
-       if (device_may_wakeup(dev))
-               return disable_irq_wake(data->irq);
-
-       return 0;
-}
-
 static int snvs_rtc_resume_noirq(struct device *dev)
 {
        struct snvs_rtc_data *data = dev_get_drvdata(dev);
@@ -400,9 +385,7 @@ static int snvs_rtc_resume_noirq(struct device *dev)
 }
 
 static const struct dev_pm_ops snvs_rtc_pm_ops = {
-       .suspend = snvs_rtc_suspend,
        .suspend_noirq = snvs_rtc_suspend_noirq,
-       .resume = snvs_rtc_resume,
        .resume_noirq = snvs_rtc_resume_noirq,
 };