Commit d2292667 authored by Kevin Hilman's avatar Kevin Hilman Committed by paul
Browse files

OMAP: omap_device: use read_persistent_clock() instead of getnstimeofday()



During suspend and resume, when omap_device deactivation and
activation is happening, the timekeeping subsystem has likely already
been suspended.  Thus getnstimeofday() will fail and trigger a WARN().

Use read_persistent_clock() instead of getnstimeofday() to avoid this.
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 5f1b6ef7
...@@ -134,12 +134,12 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat) ...@@ -134,12 +134,12 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
(od->dev_wakeup_lat <= od->_dev_wakeup_lat_limit)) (od->dev_wakeup_lat <= od->_dev_wakeup_lat_limit))
break; break;
getnstimeofday(&a); read_persistent_clock(&a);
/* XXX check return code */ /* XXX check return code */
odpl->activate_func(od); odpl->activate_func(od);
getnstimeofday(&b); read_persistent_clock(&b);
c = timespec_sub(b, a); c = timespec_sub(b, a);
act_lat = timespec_to_ns(&c) * NSEC_PER_USEC; act_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
...@@ -190,12 +190,12 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) ...@@ -190,12 +190,12 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
od->_dev_wakeup_lat_limit)) od->_dev_wakeup_lat_limit))
break; break;
getnstimeofday(&a); read_persistent_clock(&a);
/* XXX check return code */ /* XXX check return code */
odpl->deactivate_func(od); odpl->deactivate_func(od);
getnstimeofday(&b); read_persistent_clock(&b);
c = timespec_sub(b, a); c = timespec_sub(b, a);
deact_lat = timespec_to_ns(&c) * NSEC_PER_USEC; deact_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment