diff options
Diffstat (limited to 'drivers/acpi/acpica/hwacpi.c')
-rw-r--r-- | drivers/acpi/acpica/hwacpi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c index 90a9aea1cee9..2613e2945af3 100644 --- a/drivers/acpi/acpica/hwacpi.c +++ b/drivers/acpi/acpica/hwacpi.c | |||
@@ -108,8 +108,7 @@ acpi_status acpi_hw_set_mode(u32 mode) | |||
108 | * enable bits to default | 108 | * enable bits to default |
109 | */ | 109 | */ |
110 | status = acpi_hw_write_port(acpi_gbl_FADT.smi_command, | 110 | status = acpi_hw_write_port(acpi_gbl_FADT.smi_command, |
111 | (u32) acpi_gbl_FADT.acpi_disable, | 111 | (u32)acpi_gbl_FADT.acpi_disable, 8); |
112 | 8); | ||
113 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 112 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
114 | "Attempting to enable Legacy (non-ACPI) mode\n")); | 113 | "Attempting to enable Legacy (non-ACPI) mode\n")); |
115 | break; | 114 | break; |
@@ -152,18 +151,18 @@ u32 acpi_hw_get_mode(void) | |||
152 | * system does not support mode transition. | 151 | * system does not support mode transition. |
153 | */ | 152 | */ |
154 | if (!acpi_gbl_FADT.smi_command) { | 153 | if (!acpi_gbl_FADT.smi_command) { |
155 | return_UINT32(ACPI_SYS_MODE_ACPI); | 154 | return_VALUE(ACPI_SYS_MODE_ACPI); |
156 | } | 155 | } |
157 | 156 | ||
158 | status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value); | 157 | status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value); |
159 | if (ACPI_FAILURE(status)) { | 158 | if (ACPI_FAILURE(status)) { |
160 | return_UINT32(ACPI_SYS_MODE_LEGACY); | 159 | return_VALUE(ACPI_SYS_MODE_LEGACY); |
161 | } | 160 | } |
162 | 161 | ||
163 | if (value) { | 162 | if (value) { |
164 | return_UINT32(ACPI_SYS_MODE_ACPI); | 163 | return_VALUE(ACPI_SYS_MODE_ACPI); |
165 | } else { | 164 | } else { |
166 | return_UINT32(ACPI_SYS_MODE_LEGACY); | 165 | return_VALUE(ACPI_SYS_MODE_LEGACY); |
167 | } | 166 | } |
168 | } | 167 | } |
169 | 168 | ||