diff options
Diffstat (limited to 'drivers/acpi/acpica/hwesleep.c')
-rw-r--r-- | drivers/acpi/acpica/hwesleep.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c index 29e859293edd..48518dac5342 100644 --- a/drivers/acpi/acpica/hwesleep.c +++ b/drivers/acpi/acpica/hwesleep.c | |||
@@ -90,7 +90,7 @@ void acpi_hw_execute_sleep_method(char *method_pathname, u32 integer_argument) | |||
90 | * FUNCTION: acpi_hw_extended_sleep | 90 | * FUNCTION: acpi_hw_extended_sleep |
91 | * | 91 | * |
92 | * PARAMETERS: sleep_state - Which sleep state to enter | 92 | * PARAMETERS: sleep_state - Which sleep state to enter |
93 | * Flags - ACPI_EXECUTE_GTS to run optional method | 93 | * flags - ACPI_EXECUTE_GTS to run optional method |
94 | * | 94 | * |
95 | * RETURN: Status | 95 | * RETURN: Status |
96 | * | 96 | * |
@@ -117,7 +117,8 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags) | |||
117 | 117 | ||
118 | /* Clear wake status (WAK_STS) */ | 118 | /* Clear wake status (WAK_STS) */ |
119 | 119 | ||
120 | status = acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); | 120 | status = |
121 | acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); | ||
121 | if (ACPI_FAILURE(status)) { | 122 | if (ACPI_FAILURE(status)) { |
122 | return_ACPI_STATUS(status); | 123 | return_ACPI_STATUS(status); |
123 | } | 124 | } |
@@ -147,7 +148,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags) | |||
147 | ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) & | 148 | ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) & |
148 | ACPI_X_SLEEP_TYPE_MASK); | 149 | ACPI_X_SLEEP_TYPE_MASK); |
149 | 150 | ||
150 | status = acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE), | 151 | status = acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE), |
151 | &acpi_gbl_FADT.sleep_control); | 152 | &acpi_gbl_FADT.sleep_control); |
152 | if (ACPI_FAILURE(status)) { | 153 | if (ACPI_FAILURE(status)) { |
153 | return_ACPI_STATUS(status); | 154 | return_ACPI_STATUS(status); |
@@ -171,7 +172,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags) | |||
171 | * FUNCTION: acpi_hw_extended_wake_prep | 172 | * FUNCTION: acpi_hw_extended_wake_prep |
172 | * | 173 | * |
173 | * PARAMETERS: sleep_state - Which sleep state we just exited | 174 | * PARAMETERS: sleep_state - Which sleep state we just exited |
174 | * Flags - ACPI_EXECUTE_BFS to run optional method | 175 | * flags - ACPI_EXECUTE_BFS to run optional method |
175 | * | 176 | * |
176 | * RETURN: Status | 177 | * RETURN: Status |
177 | * | 178 | * |
@@ -195,7 +196,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags) | |||
195 | ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) & | 196 | ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) & |
196 | ACPI_X_SLEEP_TYPE_MASK); | 197 | ACPI_X_SLEEP_TYPE_MASK); |
197 | 198 | ||
198 | (void)acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE), | 199 | (void)acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE), |
199 | &acpi_gbl_FADT.sleep_control); | 200 | &acpi_gbl_FADT.sleep_control); |
200 | } | 201 | } |
201 | 202 | ||
@@ -212,7 +213,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags) | |||
212 | * FUNCTION: acpi_hw_extended_wake | 213 | * FUNCTION: acpi_hw_extended_wake |
213 | * | 214 | * |
214 | * PARAMETERS: sleep_state - Which sleep state we just exited | 215 | * PARAMETERS: sleep_state - Which sleep state we just exited |
215 | * Flags - Reserved, set to zero | 216 | * flags - Reserved, set to zero |
216 | * | 217 | * |
217 | * RETURN: Status | 218 | * RETURN: Status |
218 | * | 219 | * |
@@ -239,7 +240,7 @@ acpi_status acpi_hw_extended_wake(u8 sleep_state, u8 flags) | |||
239 | * and use it to determine whether the system is rebooting or | 240 | * and use it to determine whether the system is rebooting or |
240 | * resuming. Clear WAK_STS for compatibility. | 241 | * resuming. Clear WAK_STS for compatibility. |
241 | */ | 242 | */ |
242 | (void)acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); | 243 | (void)acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); |
243 | acpi_gbl_system_awake_and_running = TRUE; | 244 | acpi_gbl_system_awake_and_running = TRUE; |
244 | 245 | ||
245 | acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING); | 246 | acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING); |