diff options
Diffstat (limited to 'drivers/acpi/sleep/main.c')
-rw-r--r-- | drivers/acpi/sleep/main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 7249ba2b7a27..aee50b453265 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -23,7 +23,6 @@ u8 sleep_states[ACPI_S_STATE_COUNT]; | |||
23 | 23 | ||
24 | static struct pm_ops acpi_pm_ops; | 24 | static struct pm_ops acpi_pm_ops; |
25 | 25 | ||
26 | extern void do_suspend_lowlevel_s4bios(void); | ||
27 | extern void do_suspend_lowlevel(void); | 26 | extern void do_suspend_lowlevel(void); |
28 | 27 | ||
29 | static u32 acpi_suspend_states[] = { | 28 | static u32 acpi_suspend_states[] = { |
@@ -98,8 +97,6 @@ static int acpi_pm_enter(suspend_state_t pm_state) | |||
98 | case PM_SUSPEND_DISK: | 97 | case PM_SUSPEND_DISK: |
99 | if (acpi_pm_ops.pm_disk_mode == PM_DISK_PLATFORM) | 98 | if (acpi_pm_ops.pm_disk_mode == PM_DISK_PLATFORM) |
100 | status = acpi_enter_sleep_state(acpi_state); | 99 | status = acpi_enter_sleep_state(acpi_state); |
101 | else | ||
102 | do_suspend_lowlevel_s4bios(); | ||
103 | break; | 100 | break; |
104 | case PM_SUSPEND_MAX: | 101 | case PM_SUSPEND_MAX: |
105 | acpi_power_off(); | 102 | acpi_power_off(); |
@@ -206,11 +203,6 @@ static int __init acpi_sleep_init(void) | |||
206 | printk(" S%d", i); | 203 | printk(" S%d", i); |
207 | } | 204 | } |
208 | if (i == ACPI_STATE_S4) { | 205 | if (i == ACPI_STATE_S4) { |
209 | if (acpi_gbl_FACS->S4bios_f) { | ||
210 | sleep_states[i] = 1; | ||
211 | printk(" S4bios"); | ||
212 | acpi_pm_ops.pm_disk_mode = PM_DISK_FIRMWARE; | ||
213 | } | ||
214 | if (sleep_states[i]) | 206 | if (sleep_states[i]) |
215 | acpi_pm_ops.pm_disk_mode = PM_DISK_PLATFORM; | 207 | acpi_pm_ops.pm_disk_mode = PM_DISK_PLATFORM; |
216 | } | 208 | } |