diff options
author | Pavel Machek <pavel@suse.cz> | 2005-09-10 03:27:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 13:06:35 -0400 |
commit | b01d8684e9e5b04270970c97df856d47668267e3 (patch) | |
tree | a13f67e78a6f960a27dcfea91872136a298ee846 /drivers/acpi/sleep | |
parent | c2d08dade7743bd3a28cc5f68163e71c00a2a908 (diff) |
[PATCH] remove ACPI S4bios support
Remove S4BIOS support. It is pretty useless, and only ever worked for _me_
once. (I do not think anyone else ever tried it). It was in feature-removal
for a long time, and it should have been removed before.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r-- | drivers/acpi/sleep/main.c | 8 | ||||
-rw-r--r-- | drivers/acpi/sleep/poweroff.c | 4 | ||||
-rw-r--r-- | drivers/acpi/sleep/proc.c | 2 |
3 files changed, 1 insertions, 13 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 | } |
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c index a5f947de879b..af7935a95bcc 100644 --- a/drivers/acpi/sleep/poweroff.c +++ b/drivers/acpi/sleep/poweroff.c | |||
@@ -21,9 +21,7 @@ int acpi_sleep_prepare(u32 acpi_state) | |||
21 | { | 21 | { |
22 | #ifdef CONFIG_ACPI_SLEEP | 22 | #ifdef CONFIG_ACPI_SLEEP |
23 | /* do we have a wakeup address for S2 and S3? */ | 23 | /* do we have a wakeup address for S2 and S3? */ |
24 | /* Here, we support only S4BIOS, those we set the wakeup address */ | 24 | if (acpi_state == ACPI_STATE_S3) { |
25 | /* S4OS is only supported for now via swsusp.. */ | ||
26 | if (acpi_state == ACPI_STATE_S3 || acpi_state == ACPI_STATE_S4) { | ||
27 | if (!acpi_wakeup_address) { | 25 | if (!acpi_wakeup_address) { |
28 | return -EFAULT; | 26 | return -EFAULT; |
29 | } | 27 | } |
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 09a603f3523e..4696a85a98b9 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
@@ -25,8 +25,6 @@ static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) | |||
25 | for (i = 0; i <= ACPI_STATE_S5; i++) { | 25 | for (i = 0; i <= ACPI_STATE_S5; i++) { |
26 | if (sleep_states[i]) { | 26 | if (sleep_states[i]) { |
27 | seq_printf(seq, "S%d ", i); | 27 | seq_printf(seq, "S%d ", i); |
28 | if (i == ACPI_STATE_S4 && acpi_gbl_FACS->S4bios_f) | ||
29 | seq_printf(seq, "S4bios "); | ||
30 | } | 28 | } |
31 | } | 29 | } |
32 | 30 | ||