X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Facpi%2Fhardware%2Fhwtimer.c;fp=drivers%2Facpi%2Fhardware%2Fhwtimer.c;h=fc10b7cb456f1327935b9054bc821873f181367a;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=c4ec47c939fde51a08975c567742afe9230b23a2;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c index c4ec47c93..fc10b7cb4 100644 --- a/drivers/acpi/hardware/hwtimer.c +++ b/drivers/acpi/hardware/hwtimer.c @@ -42,6 +42,7 @@ * POSSIBILITY OF SUCH DAMAGES. */ +#include #include #define _COMPONENT ACPI_HARDWARE @@ -60,13 +61,13 @@ ACPI_MODULE_NAME("hwtimer") ******************************************************************************/ acpi_status acpi_get_timer_resolution(u32 * resolution) { - ACPI_FUNCTION_TRACE(acpi_get_timer_resolution); + ACPI_FUNCTION_TRACE("acpi_get_timer_resolution"); if (!resolution) { return_ACPI_STATUS(AE_BAD_PARAMETER); } - if (acpi_gbl_FADT->tmr_val_ext == 0) { + if (0 == acpi_gbl_FADT->tmr_val_ext) { *resolution = 24; } else { *resolution = 32; @@ -75,8 +76,6 @@ acpi_status acpi_get_timer_resolution(u32 * resolution) return_ACPI_STATUS(AE_OK); } -ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution) - /****************************************************************************** * * FUNCTION: acpi_get_timer @@ -88,11 +87,12 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution) * DESCRIPTION: Obtains current value of ACPI PM Timer (in ticks). * ******************************************************************************/ + acpi_status acpi_get_timer(u32 * ticks) { acpi_status status; - ACPI_FUNCTION_TRACE(acpi_get_timer); + ACPI_FUNCTION_TRACE("acpi_get_timer"); if (!ticks) { return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -103,7 +103,7 @@ acpi_status acpi_get_timer(u32 * ticks) return_ACPI_STATUS(status); } -ACPI_EXPORT_SYMBOL(acpi_get_timer) +EXPORT_SYMBOL(acpi_get_timer); /****************************************************************************** * @@ -133,6 +133,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer) * 2**32 Ticks / 3,600,000 Ticks/Sec = 1193 sec or 19.88 minutes * ******************************************************************************/ + acpi_status acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed) { @@ -140,7 +141,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed) u32 delta_ticks; acpi_integer quotient; - ACPI_FUNCTION_TRACE(acpi_get_timer_duration); + ACPI_FUNCTION_TRACE("acpi_get_timer_duration"); if (!time_elapsed) { return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -153,8 +154,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed) if (start_ticks < end_ticks) { delta_ticks = end_ticks - start_ticks; } else if (start_ticks > end_ticks) { - if (acpi_gbl_FADT->tmr_val_ext == 0) { - + if (0 == acpi_gbl_FADT->tmr_val_ext) { /* 24-bit Timer */ delta_ticks = @@ -183,4 +183,4 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed) return_ACPI_STATUS(status); } -ACPI_EXPORT_SYMBOL(acpi_get_timer_duration) +EXPORT_SYMBOL(acpi_get_timer_duration);