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 29e859293ed..48518dac534 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)   * FUNCTION:    acpi_hw_extended_sleep   *   * PARAMETERS:  sleep_state         - Which sleep state to enter - *              Flags               - ACPI_EXECUTE_GTS to run optional method + *              flags               - ACPI_EXECUTE_GTS to run optional method   *   * RETURN:      Status   * @@ -117,7 +117,8 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)  	/* Clear wake status (WAK_STS) */ -	status = acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); +	status = +	    acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);  	if (ACPI_FAILURE(status)) {  		return_ACPI_STATUS(status);  	} @@ -147,7 +148,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)  	    ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &  	     ACPI_X_SLEEP_TYPE_MASK); -	status = acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE), +	status = acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),  			    &acpi_gbl_FADT.sleep_control);  	if (ACPI_FAILURE(status)) {  		return_ACPI_STATUS(status); @@ -171,7 +172,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)   * FUNCTION:    acpi_hw_extended_wake_prep   *   * PARAMETERS:  sleep_state         - Which sleep state we just exited - *              Flags               - ACPI_EXECUTE_BFS to run optional method + *              flags               - ACPI_EXECUTE_BFS to run optional method   *   * RETURN:      Status   * @@ -195,7 +196,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags)  		    ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &  		     ACPI_X_SLEEP_TYPE_MASK); -		(void)acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE), +		(void)acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),  				 &acpi_gbl_FADT.sleep_control);  	} @@ -212,7 +213,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags)   * FUNCTION:    acpi_hw_extended_wake   *   * PARAMETERS:  sleep_state         - Which sleep state we just exited - *              Flags               - Reserved, set to zero + *              flags               - Reserved, set to zero   *   * RETURN:      Status   * @@ -239,7 +240,7 @@ acpi_status acpi_hw_extended_wake(u8 sleep_state, u8 flags)  	 * and use it to determine whether the system is rebooting or  	 * resuming. Clear WAK_STS for compatibility.  	 */ -	(void)acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status); +	(void)acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);  	acpi_gbl_system_awake_and_running = TRUE;  	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);  |