aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/rtc/rtc-cmos.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index cae212f30d65..0963c9309c74 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -837,7 +837,7 @@ static void __exit cmos_do_remove(struct device *dev)
837 cmos->dev = NULL; 837 cmos->dev = NULL;
838} 838}
839 839
840#ifdef CONFIG_PM 840#ifdef CONFIG_PM_SLEEP
841 841
842static int cmos_suspend(struct device *dev) 842static int cmos_suspend(struct device *dev)
843{ 843{
@@ -935,8 +935,6 @@ static int cmos_resume(struct device *dev)
935 return 0; 935 return 0;
936} 936}
937 937
938static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
939
940#else 938#else
941 939
942static inline int cmos_poweroff(struct device *dev) 940static inline int cmos_poweroff(struct device *dev)
@@ -946,6 +944,8 @@ static inline int cmos_poweroff(struct device *dev)
946 944
947#endif 945#endif
948 946
947static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
948
949/*----------------------------------------------------------------*/ 949/*----------------------------------------------------------------*/
950 950
951/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus. 951/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus.
@@ -1088,11 +1088,9 @@ static struct pnp_driver cmos_pnp_driver = {
1088 1088
1089 /* flag ensures resume() gets called, and stops syslog spam */ 1089 /* flag ensures resume() gets called, and stops syslog spam */
1090 .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, 1090 .flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
1091#ifdef CONFIG_PM_SLEEP
1092 .driver = { 1091 .driver = {
1093 .pm = &cmos_pm_ops, 1092 .pm = &cmos_pm_ops,
1094 }, 1093 },
1095#endif
1096}; 1094};
1097 1095
1098#endif /* CONFIG_PNP */ 1096#endif /* CONFIG_PNP */