diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-06-04 19:17:28 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-06-11 19:33:19 -0400 |
commit | 0e6859d49ff194e01afc229c996e3aefca1a0539 (patch) | |
tree | 4be0ecee4ebe44662a3a67953e57b2f8cd74c9c5 /drivers/acpi/sleep | |
parent | 8d2bdf49481b27096e242119e73abe9348c1019b (diff) |
ACPI PM: Remove obsolete Toshiba workaround
Remove the obsolete workaround for a Toshiba Satellite 4030cdt
S1 problem from drivers/acpi/sleep/main.c .
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r-- | drivers/acpi/sleep/main.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index fbd40e96ed14..0f2caea2fc83 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -62,8 +62,6 @@ static u32 acpi_suspend_states[] = { | |||
62 | [PM_SUSPEND_MAX] = ACPI_STATE_S5 | 62 | [PM_SUSPEND_MAX] = ACPI_STATE_S5 |
63 | }; | 63 | }; |
64 | 64 | ||
65 | static int init_8259A_after_S1; | ||
66 | |||
67 | /** | 65 | /** |
68 | * acpi_suspend_begin - Set the target system sleep state to the state | 66 | * acpi_suspend_begin - Set the target system sleep state to the state |
69 | * associated with given @pm_state, if supported. | 67 | * associated with given @pm_state, if supported. |
@@ -186,13 +184,6 @@ static void acpi_suspend_finish(void) | |||
186 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); | 184 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); |
187 | 185 | ||
188 | acpi_target_sleep_state = ACPI_STATE_S0; | 186 | acpi_target_sleep_state = ACPI_STATE_S0; |
189 | |||
190 | #ifdef CONFIG_X86 | ||
191 | if (init_8259A_after_S1) { | ||
192 | printk("Broken toshiba laptop -> kicking interrupts\n"); | ||
193 | init_8259A(0); | ||
194 | } | ||
195 | #endif | ||
196 | } | 187 | } |
197 | 188 | ||
198 | /** | 189 | /** |
@@ -232,26 +223,6 @@ static struct platform_suspend_ops acpi_suspend_ops = { | |||
232 | .finish = acpi_suspend_finish, | 223 | .finish = acpi_suspend_finish, |
233 | .end = acpi_suspend_end, | 224 | .end = acpi_suspend_end, |
234 | }; | 225 | }; |
235 | |||
236 | /* | ||
237 | * Toshiba fails to preserve interrupts over S1, reinitialization | ||
238 | * of 8259 is needed after S1 resume. | ||
239 | */ | ||
240 | static int __init init_ints_after_s1(const struct dmi_system_id *d) | ||
241 | { | ||
242 | printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident); | ||
243 | init_8259A_after_S1 = 1; | ||
244 | return 0; | ||
245 | } | ||
246 | |||
247 | static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | ||
248 | { | ||
249 | .callback = init_ints_after_s1, | ||
250 | .ident = "Toshiba Satellite 4030cdt", | ||
251 | .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),}, | ||
252 | }, | ||
253 | {}, | ||
254 | }; | ||
255 | #endif /* CONFIG_SUSPEND */ | 226 | #endif /* CONFIG_SUSPEND */ |
256 | 227 | ||
257 | #ifdef CONFIG_HIBERNATION | 228 | #ifdef CONFIG_HIBERNATION |
@@ -473,8 +444,6 @@ int __init acpi_sleep_init(void) | |||
473 | u8 type_a, type_b; | 444 | u8 type_a, type_b; |
474 | #ifdef CONFIG_SUSPEND | 445 | #ifdef CONFIG_SUSPEND |
475 | int i = 0; | 446 | int i = 0; |
476 | |||
477 | dmi_check_system(acpisleep_dmi_table); | ||
478 | #endif | 447 | #endif |
479 | 448 | ||
480 | if (acpi_disabled) | 449 | if (acpi_disabled) |