Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-coh901331.c

diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 2d28ec1aa1cd9cd85e6e411b6d9ebde6fc0b60a7..93c06588ddca58a18ec85025e0ef26f4e1945b3a 100644 (file)
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -47,7 +47,7 @@ struct coh901331_port {
        u32 physize;
        void __iomem *virtbase;
        int irq;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        u32 irqmaskstore;
 #endif
 };
@@ -155,7 +155,6 @@ static int __exit coh901331_remove(struct platform_device *pdev)
        struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
 
        if (rtap) {
-               rtc_device_unregister(rtap->rtc);
                clk_unprepare(rtap->clk);
                platform_set_drvdata(pdev, NULL);
        }
@@ -211,8 +210,8 @@ static int __init coh901331_probe(struct platform_device *pdev)
        clk_disable(rtap->clk);
 
        platform_set_drvdata(pdev, rtap);
-       rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops,
-                                        THIS_MODULE);
+       rtap->rtc = devm_rtc_device_register(&pdev->dev, "coh901331",
+                                       &coh901331_ops, THIS_MODULE);
        if (IS_ERR(rtap->rtc)) {
                ret = PTR_ERR(rtap->rtc);
                goto out_no_rtc;
@@ -226,17 +225,17 @@ static int __init coh901331_probe(struct platform_device *pdev)
        return ret;
 }
 
-#ifdef CONFIG_PM
-static int coh901331_suspend(struct platform_device *pdev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int coh901331_suspend(struct device *dev)
 {
-       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
 
        /*
         * If this RTC alarm will be used for waking the system up,
         * don't disable it of course. Else we just disable the alarm
         * and await suspension.
         */
-       if (device_may_wakeup(&pdev->dev)) {
+       if (device_may_wakeup(dev)) {
                enable_irq_wake(rtap->irq);
        } else {
                clk_enable(rtap->clk);
@@ -248,12 +247,12 @@ static int coh901331_suspend(struct platform_device *pdev, pm_message_t state)
        return 0;
 }
 
-static int coh901331_resume(struct platform_device *pdev)
+static int coh901331_resume(struct device *dev)
 {
-       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
 
        clk_prepare(rtap->clk);
-       if (device_may_wakeup(&pdev->dev)) {
+       if (device_may_wakeup(dev)) {
                disable_irq_wake(rtap->irq);
        } else {
                clk_enable(rtap->clk);
@@ -262,11 +261,10 @@ static int coh901331_resume(struct platform_device *pdev)
        }
        return 0;
 }
-#else
-#define coh901331_suspend NULL
-#define coh901331_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(coh901331_pm_ops, coh901331_suspend, coh901331_resume);
+
 static void coh901331_shutdown(struct platform_device *pdev)
 {
        struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
@@ -280,25 +278,13 @@ static struct platform_driver coh901331_driver = {
        .driver = {
                .name = "rtc-coh901331",
                .owner = THIS_MODULE,
+               .pm = &coh901331_pm_ops,
        },
        .remove = __exit_p(coh901331_remove),
-       .suspend = coh901331_suspend,
-       .resume = coh901331_resume,
        .shutdown = coh901331_shutdown,
 };
 
-static int __init coh901331_init(void)
-{
-       return platform_driver_probe(&coh901331_driver, coh901331_probe);
-}
-
-static void __exit coh901331_exit(void)
-{
-       platform_driver_unregister(&coh901331_driver);
-}
-
-module_init(coh901331_init);
-module_exit(coh901331_exit);
+module_platform_driver_probe(coh901331_driver, coh901331_probe);
 
 MODULE_AUTHOR("Linus Walleij <linus.walleij@stericsson.com>");
 MODULE_DESCRIPTION("ST-Ericsson AB COH 901 331 RTC Driver");