diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpica/acinterp.h | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/exoparg1.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/exsystem.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h index 9a9b89312b09..049e203bd621 100644 --- a/drivers/acpi/acpica/acinterp.h +++ b/drivers/acpi/acpica/acinterp.h | |||
@@ -281,7 +281,7 @@ acpi_status | |||
281 | acpi_ex_system_do_notify_op(union acpi_operand_object *value, | 281 | acpi_ex_system_do_notify_op(union acpi_operand_object *value, |
282 | union acpi_operand_object *obj_desc); | 282 | union acpi_operand_object *obj_desc); |
283 | 283 | ||
284 | acpi_status acpi_ex_system_do_suspend(u64 time); | 284 | acpi_status acpi_ex_system_do_sleep(u64 time); |
285 | 285 | ||
286 | acpi_status acpi_ex_system_do_stall(u32 time); | 286 | acpi_status acpi_ex_system_do_stall(u32 time); |
287 | 287 | ||
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c index 38e0f3c1f1d7..84e4d185aa25 100644 --- a/drivers/acpi/acpica/exoparg1.c +++ b/drivers/acpi/acpica/exoparg1.c | |||
@@ -173,7 +173,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state) | |||
173 | 173 | ||
174 | case AML_SLEEP_OP: /* Sleep (msec_time) */ | 174 | case AML_SLEEP_OP: /* Sleep (msec_time) */ |
175 | 175 | ||
176 | status = acpi_ex_system_do_suspend(operand[0]->integer.value); | 176 | status = acpi_ex_system_do_sleep(operand[0]->integer.value); |
177 | break; | 177 | break; |
178 | 178 | ||
179 | case AML_STALL_OP: /* Stall (usec_time) */ | 179 | case AML_STALL_OP: /* Stall (usec_time) */ |
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c index c9513d534082..6d32e09327f1 100644 --- a/drivers/acpi/acpica/exsystem.c +++ b/drivers/acpi/acpica/exsystem.c | |||
@@ -182,18 +182,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long) | |||
182 | 182 | ||
183 | /******************************************************************************* | 183 | /******************************************************************************* |
184 | * | 184 | * |
185 | * FUNCTION: acpi_ex_system_do_suspend | 185 | * FUNCTION: acpi_ex_system_do_sleep |
186 | * | 186 | * |
187 | * PARAMETERS: how_long - The amount of time to suspend, | 187 | * PARAMETERS: how_long - The amount of time to sleep, |
188 | * in milliseconds | 188 | * in milliseconds |
189 | * | 189 | * |
190 | * RETURN: None | 190 | * RETURN: None |
191 | * | 191 | * |
192 | * DESCRIPTION: Suspend running thread for specified amount of time. | 192 | * DESCRIPTION: Sleep the running thread for specified amount of time. |
193 | * | 193 | * |
194 | ******************************************************************************/ | 194 | ******************************************************************************/ |
195 | 195 | ||
196 | acpi_status acpi_ex_system_do_suspend(u64 how_long) | 196 | acpi_status acpi_ex_system_do_sleep(u64 how_long) |
197 | { | 197 | { |
198 | ACPI_FUNCTION_ENTRY(); | 198 | ACPI_FUNCTION_ENTRY(); |
199 | 199 | ||