summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2013-01-16 00:09:48 +0800
committerJohn Stultz <john.stultz@linaro.org>2013-01-15 18:16:08 -0800
commit9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0 (patch)
treec1753603b4d286a5cb45570ebc52d69caea51bad /drivers/rtc
parent31ade30692dc9680bfc95700d794818fa3f754ac (diff)
downloadop-kernel-dev-9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0.zip
op-kernel-dev-9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0.tar.gz
rtc: Skip the suspend/resume handling if persistent clock exist
All the RTC suspend and resume functions are to compensate the sleep time, but this is already done in timekeeping.c if persistent clock exist. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Arve Hjønnevåg <arve@android.com> Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/class.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index f8a0aab..c01773f 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -50,6 +50,10 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg)
struct rtc_device *rtc = to_rtc_device(dev);
struct rtc_time tm;
struct timespec delta, delta_delta;
+
+ if (has_persistent_clock())
+ return 0;
+
if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
return 0;
@@ -88,6 +92,9 @@ static int rtc_resume(struct device *dev)
struct timespec new_system, new_rtc;
struct timespec sleep_time;
+ if (has_persistent_clock())
+ return 0;
+
rtc_hctosys_ret = -ENODEV;
if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
return 0;
OpenPOWER on IntegriCloud