diff options
Diffstat (limited to 'arch/arm/plat-omap/omap_device.c')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
| 142 | read_persistent_clock(&b); | 142 | read_persistent_clock(&b); |
| 143 | 143 | ||
| 144 | c = timespec_sub(b, a); | 144 | c = timespec_sub(b, a); |
| 145 | act_lat = timespec_to_ns(&c) / NSEC_PER_USEC; | 145 | act_lat = timespec_to_ns(&c); |
| 146 | 146 | ||
| 147 | pr_debug("omap_device: %s: pm_lat %d: activate: elapsed time " | 147 | pr_debug("omap_device: %s: pm_lat %d: activate: elapsed time " |
| 148 | "%llu usec\n", od->pdev.name, od->pm_lat_level, | 148 | "%llu nsec\n", od->pdev.name, od->pm_lat_level, |
| 149 | act_lat); | 149 | act_lat); |
| 150 | 150 | ||
| 151 | WARN(act_lat > odpl->activate_lat, "omap_device: %s.%d: " | 151 | 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) | |||
| 198 | read_persistent_clock(&b); | 198 | read_persistent_clock(&b); |
| 199 | 199 | ||
| 200 | c = timespec_sub(b, a); | 200 | c = timespec_sub(b, a); |
| 201 | deact_lat = timespec_to_ns(&c) / NSEC_PER_USEC; | 201 | deact_lat = timespec_to_ns(&c); |
| 202 | 202 | ||
| 203 | pr_debug("omap_device: %s: pm_lat %d: deactivate: elapsed time " | 203 | pr_debug("omap_device: %s: pm_lat %d: deactivate: elapsed time " |
| 204 | "%llu usec\n", od->pdev.name, od->pm_lat_level, | 204 | "%llu nsec\n", od->pdev.name, od->pm_lat_level, |
| 205 | deact_lat); | 205 | deact_lat); |
| 206 | 206 | ||
| 207 | WARN(deact_lat > odpl->deactivate_lat, "omap_device: %s.%d: " | 207 | WARN(deact_lat > odpl->deactivate_lat, "omap_device: %s.%d: " |
