diff options
author | Bob Moore <robert.moore@intel.com> | 2009-03-05 21:05:18 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-27 12:11:02 -0400 |
commit | d4913dc6d0c680aa106d1d80b5ad2a9325367afd (patch) | |
tree | 4ce6e658b21a2bc69e7c57caa6f7dfa1ff8ec53b /drivers/acpi/acpica/hwsleep.c | |
parent | 768aaaf196e8a40f5cfc792d9d365795cc52ed13 (diff) |
ACPICA: Formatting update - no functional changes
Split long lines, update comments.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/hwsleep.c')
-rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 4d14b49a0f6c..2ea4c59e8838 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
@@ -349,8 +349,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
349 | * Wait ten seconds, then try again. This is to get S4/S5 to work on | 349 | * Wait ten seconds, then try again. This is to get S4/S5 to work on |
350 | * all machines. | 350 | * all machines. |
351 | * | 351 | * |
352 | * We wait so long to allow chipsets that poll this reg very slowly to | 352 | * We wait so long to allow chipsets that poll this reg very slowly |
353 | * still read the right value. Ideally, this block would go | 353 | * to still read the right value. Ideally, this block would go |
354 | * away entirely. | 354 | * away entirely. |
355 | */ | 355 | */ |
356 | acpi_os_stall(10000000); | 356 | acpi_os_stall(10000000); |
@@ -501,12 +501,10 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) | |||
501 | 501 | ||
502 | /* Insert the SLP_TYP bits */ | 502 | /* Insert the SLP_TYP bits */ |
503 | 503 | ||
504 | pm1a_control |= | 504 | pm1a_control |= (acpi_gbl_sleep_type_a << |
505 | (acpi_gbl_sleep_type_a << sleep_type_reg_info-> | 505 | sleep_type_reg_info->bit_position); |
506 | bit_position); | 506 | pm1b_control |= (acpi_gbl_sleep_type_b << |
507 | pm1b_control |= | 507 | sleep_type_reg_info->bit_position); |
508 | (acpi_gbl_sleep_type_b << sleep_type_reg_info-> | ||
509 | bit_position); | ||
510 | 508 | ||
511 | /* Write the control registers and ignore any errors */ | 509 | /* Write the control registers and ignore any errors */ |
512 | 510 | ||