diff options
author | Bob Moore <robert.moore@intel.com> | 2007-02-02 11:48:21 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:26 -0500 |
commit | d8c71b6d3b21cf21ad775e1cf6da95bf87bd5ad4 (patch) | |
tree | 8525fe67ab2a3fb2bb4f203bdc7c9b6bb090afcc /drivers/acpi/hardware/hwsleep.c | |
parent | 73ca0fbcc25a6080db4136f55dbcd5fe7b33398f (diff) |
ACPICA: Remove obsolete Flags parameter.
Remove flags parameter for acpi_{get,set}_register().
It is no longer necessary now that these functions use a
spinlock for mutual exclusion.
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/hardware/hwsleep.c')
-rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index 6faa76bdc3d5..7c9645129210 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c | |||
@@ -277,15 +277,14 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
277 | 277 | ||
278 | /* Clear wake status */ | 278 | /* Clear wake status */ |
279 | 279 | ||
280 | status = | 280 | status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1); |
281 | acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); | ||
282 | if (ACPI_FAILURE(status)) { | 281 | if (ACPI_FAILURE(status)) { |
283 | return_ACPI_STATUS(status); | 282 | return_ACPI_STATUS(status); |
284 | } | 283 | } |
285 | 284 | ||
286 | /* Clear all fixed and general purpose status bits */ | 285 | /* Clear all fixed and general purpose status bits */ |
287 | 286 | ||
288 | status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK); | 287 | status = acpi_hw_clear_acpi_status(); |
289 | if (ACPI_FAILURE(status)) { | 288 | if (ACPI_FAILURE(status)) { |
290 | return_ACPI_STATUS(status); | 289 | return_ACPI_STATUS(status); |
291 | } | 290 | } |
@@ -398,8 +397,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
398 | /* Wait until we enter sleep state */ | 397 | /* Wait until we enter sleep state */ |
399 | 398 | ||
400 | do { | 399 | do { |
401 | status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value, | 400 | status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value); |
402 | ACPI_MTX_DO_NOT_LOCK); | ||
403 | if (ACPI_FAILURE(status)) { | 401 | if (ACPI_FAILURE(status)) { |
404 | return_ACPI_STATUS(status); | 402 | return_ACPI_STATUS(status); |
405 | } | 403 | } |
@@ -432,13 +430,12 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void) | |||
432 | 430 | ||
433 | ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios); | 431 | ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios); |
434 | 432 | ||
435 | status = | 433 | status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1); |
436 | acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); | ||
437 | if (ACPI_FAILURE(status)) { | 434 | if (ACPI_FAILURE(status)) { |
438 | return_ACPI_STATUS(status); | 435 | return_ACPI_STATUS(status); |
439 | } | 436 | } |
440 | 437 | ||
441 | status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK); | 438 | status = acpi_hw_clear_acpi_status(); |
442 | if (ACPI_FAILURE(status)) { | 439 | if (ACPI_FAILURE(status)) { |
443 | return_ACPI_STATUS(status); | 440 | return_ACPI_STATUS(status); |
444 | } | 441 | } |
@@ -465,8 +462,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void) | |||
465 | 462 | ||
466 | do { | 463 | do { |
467 | acpi_os_stall(1000); | 464 | acpi_os_stall(1000); |
468 | status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value, | 465 | status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value); |
469 | ACPI_MTX_DO_NOT_LOCK); | ||
470 | if (ACPI_FAILURE(status)) { | 466 | if (ACPI_FAILURE(status)) { |
471 | return_ACPI_STATUS(status); | 467 | return_ACPI_STATUS(status); |
472 | } | 468 | } |
@@ -599,13 +595,11 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state) | |||
599 | 595 | ||
600 | (void) | 596 | (void) |
601 | acpi_set_register(acpi_gbl_fixed_event_info | 597 | acpi_set_register(acpi_gbl_fixed_event_info |
602 | [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1, | 598 | [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1); |
603 | ACPI_MTX_DO_NOT_LOCK); | ||
604 | 599 | ||
605 | (void) | 600 | (void) |
606 | acpi_set_register(acpi_gbl_fixed_event_info | 601 | acpi_set_register(acpi_gbl_fixed_event_info |
607 | [ACPI_EVENT_POWER_BUTTON].status_register_id, 1, | 602 | [ACPI_EVENT_POWER_BUTTON].status_register_id, 1); |
608 | ACPI_MTX_DO_NOT_LOCK); | ||
609 | 603 | ||
610 | arg.integer.value = ACPI_SST_WORKING; | 604 | arg.integer.value = ACPI_SST_WORKING; |
611 | status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL); | 605 | status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL); |