summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/hwtimer.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-12-31 00:05:46 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-10 12:36:20 +0100
commitc41679a4481d5bf9908d99644d47b2e8ff6f028f (patch)
tree89a95a2f59b1406722644bf47976a071f9835e71 /drivers/acpi/acpica/hwtimer.c
parentc8d586f8ed0146d81186131df66cdbb19c41acda (diff)
downloadblackbird-op-linux-c41679a4481d5bf9908d99644d47b2e8ff6f028f.tar.gz
blackbird-op-linux-c41679a4481d5bf9908d99644d47b2e8ff6f028f.zip
ACPICA: Add time macros for various timer/time manipulation.
Constants for time manipulation, including constants for the 100 nanosecond timers. Chao Guan, Bob Moore, Lv Zheng. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/hwtimer.c')
-rw-r--r--drivers/acpi/acpica/hwtimer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index bfdce22f3798..4e741d85e6b4 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -176,10 +176,11 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
/*
* Compute Duration (Requires a 64-bit multiply and divide):
*
- * time_elapsed = (delta_ticks * 1000000) / PM_TIMER_FREQUENCY;
+ * time_elapsed (microseconds) =
+ * (delta_ticks * ACPI_USEC_PER_SEC) / ACPI_PM_TIMER_FREQUENCY;
*/
- status = acpi_ut_short_divide(((u64) delta_ticks) * 1000000,
- PM_TIMER_FREQUENCY, &quotient, NULL);
+ status = acpi_ut_short_divide(((u64)delta_ticks) * ACPI_USEC_PER_SEC,
+ ACPI_PM_TIMER_FREQUENCY, &quotient, NULL);
*time_elapsed = (u32) quotient;
return_ACPI_STATUS(status);
OpenPOWER on IntegriCloud