diff options
Diffstat (limited to 'drivers/acpi/acpica/hwxfsleep.c')
-rw-r--r-- | drivers/acpi/acpica/hwxfsleep.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c index ae443fe2ebf6..35eebdac0f9d 100644 --- a/drivers/acpi/acpica/hwxfsleep.c +++ b/drivers/acpi/acpica/hwxfsleep.c | |||
@@ -5,7 +5,7 @@ | |||
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2012, Intel Corp. | 8 | * Copyright (C) 2000 - 2013, Intel Corp. |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -41,9 +41,9 @@ | |||
41 | * POSSIBILITY OF SUCH DAMAGES. | 41 | * POSSIBILITY OF SUCH DAMAGES. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <linux/export.h> | ||
44 | #include <acpi/acpi.h> | 45 | #include <acpi/acpi.h> |
45 | #include "accommon.h" | 46 | #include "accommon.h" |
46 | #include <linux/module.h> | ||
47 | 47 | ||
48 | #define _COMPONENT ACPI_HARDWARE | 48 | #define _COMPONENT ACPI_HARDWARE |
49 | ACPI_MODULE_NAME("hwxfsleep") | 49 | ACPI_MODULE_NAME("hwxfsleep") |
@@ -207,7 +207,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void) | |||
207 | (u32)acpi_gbl_FADT.s4_bios_request, 8); | 207 | (u32)acpi_gbl_FADT.s4_bios_request, 8); |
208 | 208 | ||
209 | do { | 209 | do { |
210 | acpi_os_stall(1000); | 210 | acpi_os_stall(ACPI_USEC_PER_MSEC); |
211 | status = | 211 | status = |
212 | acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value); | 212 | acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value); |
213 | if (ACPI_FAILURE(status)) { | 213 | if (ACPI_FAILURE(status)) { |
@@ -350,7 +350,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) | |||
350 | * | 350 | * |
351 | * RETURN: Status | 351 | * RETURN: Status |
352 | * | 352 | * |
353 | * DESCRIPTION: Enter a system sleep state (see ACPI 2.0 spec p 231) | 353 | * DESCRIPTION: Enter a system sleep state |
354 | * THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED | 354 | * THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED |
355 | * | 355 | * |
356 | ******************************************************************************/ | 356 | ******************************************************************************/ |
@@ -382,8 +382,9 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state) | |||
382 | * RETURN: Status | 382 | * RETURN: Status |
383 | * | 383 | * |
384 | * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a | 384 | * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a |
385 | * sleep. | 385 | * sleep. Called with interrupts DISABLED. |
386 | * Called with interrupts DISABLED. | 386 | * We break wake/resume into 2 stages so that OSPM can handle |
387 | * various OS-specific tasks between the two steps. | ||
387 | * | 388 | * |
388 | ******************************************************************************/ | 389 | ******************************************************************************/ |
389 | acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) | 390 | acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) |