|
@@ -38,7 +38,7 @@ static void rtc_device_release(struct device *dev)
|
|
|
int rtc_hctosys_ret = -ENODEV;
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
|
|
|
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
|
|
|
/*
|
|
|
* On suspend(), measure the delta between one RTC and the
|
|
|
* system's wall clock; restore it on resume().
|
|
@@ -47,7 +47,7 @@ int rtc_hctosys_ret = -ENODEV;
|
|
|
static struct timespec old_rtc, old_system, old_delta;
|
|
|
|
|
|
|
|
|
-static int rtc_suspend(struct device *dev, pm_message_t mesg)
|
|
|
+static int rtc_suspend(struct device *dev)
|
|
|
{
|
|
|
struct rtc_device *rtc = to_rtc_device(dev);
|
|
|
struct rtc_time tm;
|
|
@@ -135,9 +135,10 @@ static int rtc_resume(struct device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static SIMPLE_DEV_PM_OPS(rtc_class_dev_pm_ops, rtc_suspend, rtc_resume);
|
|
|
+#define RTC_CLASS_DEV_PM_OPS (&rtc_class_dev_pm_ops)
|
|
|
#else
|
|
|
-#define rtc_suspend NULL
|
|
|
-#define rtc_resume NULL
|
|
|
+#define RTC_CLASS_DEV_PM_OPS NULL
|
|
|
#endif
|
|
|
|
|
|
|
|
@@ -336,8 +337,7 @@ static int __init rtc_init(void)
|
|
|
pr_err("couldn't create class\n");
|
|
|
return PTR_ERR(rtc_class);
|
|
|
}
|
|
|
- rtc_class->suspend = rtc_suspend;
|
|
|
- rtc_class->resume = rtc_resume;
|
|
|
+ rtc_class->pm = RTC_CLASS_DEV_PM_OPS;
|
|
|
rtc_dev_init();
|
|
|
rtc_sysfs_init(rtc_class);
|
|
|
return 0;
|