diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-12-08 16:34:26 -0700 | 
|---|---|---|
| committer | paul <paul@twilight.(none)> | 2009-12-11 17:00:44 -0700 | 
| commit | 0d93d8bb7f52190d76e9dba7f4561aabefaff34a (patch) | |
| tree | 93aa385996af88300fe873c384364f2f876b5544 | |
| parent | d048ec7ab48254c505e1cee49441345ce12129fd (diff) | |
OMAP: omap_device: track latency in nanoseconds
Rather than having to do a usecs = nsecs / NSECS_PER_USEC to
track latency in usecs, just track it in nanoseconds.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_device.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 8 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h index d93924699a1b..dc1fac1d805c 100644 --- a/arch/arm/plat-omap/include/plat/omap_device.h +++ b/arch/arm/plat-omap/include/plat/omap_device.h @@ -50,8 +50,8 @@   * @pm_lats: ptr to an omap_device_pm_latency table   * @pm_lats_cnt: ARRAY_SIZE() of what is passed to @pm_lats   * @pm_lat_level: array index of the last odpl entry executed - -1 if never - * @dev_wakeup_lat: dev wakeup latency in microseconds - * @_dev_wakeup_lat_limit: dev wakeup latency limit in usec - set by OMAP PM + * @dev_wakeup_lat: dev wakeup latency in nanoseconds + * @_dev_wakeup_lat_limit: dev wakeup latency limit in nsec - set by OMAP PM   * @_state: one of OMAP_DEVICE_STATE_* (see above)   * @flags: device flags   * diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 51c9d560a0cd..1e5648d3e3d8 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -142,10 +142,10 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)  		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: " @@ -198,10 +198,10 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)  		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: " | 
