]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-sa1100: switch to using SIMPLE_DEV_PM_OPS
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:59 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:32 +0000 (18:28 -0700)
Switch to using the SIMPLE_DEV_PM_OPS macro to declare the driver's
pm_ops.  It reduces code size.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-sa1100.c

index 5ec5036df0bce39c535a87a5fed23c0b1e0e9ede..7e0a0887c2567c50c4050b8f02962163604bdad5 100644 (file)
@@ -327,7 +327,7 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int sa1100_rtc_suspend(struct device *dev)
 {
        struct sa1100_rtc *info = dev_get_drvdata(dev);
@@ -343,13 +343,11 @@ static int sa1100_rtc_resume(struct device *dev)
                disable_irq_wake(info->irq_alarm);
        return 0;
 }
-
-static const struct dev_pm_ops sa1100_rtc_pm_ops = {
-       .suspend        = sa1100_rtc_suspend,
-       .resume         = sa1100_rtc_resume,
-};
 #endif
 
+static SIMPLE_DEV_PM_OPS(sa1100_rtc_pm_ops, sa1100_rtc_suspend,
+                       sa1100_rtc_resume);
+
 #ifdef CONFIG_OF
 static struct of_device_id sa1100_rtc_dt_ids[] = {
        { .compatible = "mrvl,sa1100-rtc", },
@@ -364,9 +362,7 @@ static struct platform_driver sa1100_rtc_driver = {
        .remove         = sa1100_rtc_remove,
        .driver         = {
                .name   = "sa1100-rtc",
-#ifdef CONFIG_PM
                .pm     = &sa1100_rtc_pm_ops,
-#endif
                .of_match_table = of_match_ptr(sa1100_rtc_dt_ids),
        },
 };