Merge branch 'thinkpad-2.6.33' into release

[sfrench/cifs-2.6.git] / arch / arm / plat-omap / omap_device.c

diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index bb16e624a557aabbeea7ee8d952b490acbea2678..1e5648d3e3d8a04a08092e42777b593cca04f073 100644 (file)
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -134,18 +134,18 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
                    (od->dev_wakeup_lat <= od->_dev_wakeup_lat_limit))
                        break;
 
-               getnstimeofday(&a);
+               read_persistent_clock(&a);
 
                /* XXX check return code */
                odpl->activate_func(od);
 
-               getnstimeofday(&b);
+               read_persistent_clock(&b);
 
                c = timespec_sub(b, a);
-               act_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
+               act_lat = timespec_to_ns(&c);
 
                pr_debug("omap_device: %s: pm_lat %d: activate: elapsed time "
-                        "%llu usec\n", od->pdev.name, od->pm_lat_level,
+                        "%llu nsec\n", od->pdev.name, od->pm_lat_level,
                         act_lat);
 
                WARN(act_lat > odpl->activate_lat, "omap_device: %s.%d: "
@@ -190,18 +190,18 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
                     od->_dev_wakeup_lat_limit))
                        break;
 
-               getnstimeofday(&a);
+               read_persistent_clock(&a);
 
                /* XXX check return code */
                odpl->deactivate_func(od);
 
-               getnstimeofday(&b);
+               read_persistent_clock(&b);
 
                c = timespec_sub(b, a);
-               deact_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
+               deact_lat = timespec_to_ns(&c);
 
                pr_debug("omap_device: %s: pm_lat %d: deactivate: elapsed time "
-                        "%llu usec\n", od->pdev.name, od->pm_lat_level,
+                        "%llu nsec\n", od->pdev.name, od->pm_lat_level,
                         deact_lat);
 
                WARN(deact_lat > odpl->deactivate_lat, "omap_device: %s.%d: "
@@ -459,7 +459,7 @@ int omap_device_enable(struct platform_device *pdev)
        ret = _omap_device_activate(od, IGNORE_WAKEUP_LAT);
 
        od->dev_wakeup_lat = 0;
-       od->_dev_wakeup_lat_limit = INT_MAX;
+       od->_dev_wakeup_lat_limit = UINT_MAX;
        od->_state = OMAP_DEVICE_STATE_ENABLED;
 
        return ret;