aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-24 05:58:39 -0400
committerLen Brown <len.brown@intel.com>2007-07-24 11:23:50 -0400
commit50ad147aa09c829cd452fae6ca99396c0b5b0695 (patch)
tree1f7bacbedb08e96e6cdca2216eee9a03ef32b988 /drivers/acpi
parent10b3dcae0f275e2546e55303d64ddbb58cec7599 (diff)
ACPI: Remove references to ACPI_STATE_S2 from acpi_pm_enter
Remove references to ACPI_STATE_S2, introduced by acpi-implement-the-set_target-callback-from-pm_ops.patch, from acpi_pm_enter(). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 55eca6eabcd8..29bdb013f46c 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -81,8 +81,8 @@ static int acpi_pm_prepare(suspend_state_t pm_state)
81 * acpi_pm_enter - Actually enter a sleep state. 81 * acpi_pm_enter - Actually enter a sleep state.
82 * @pm_state: ignored 82 * @pm_state: ignored
83 * 83 *
84 * Flush caches and go to sleep. For STR or S2, we have to call 84 * Flush caches and go to sleep. For STR we have to call arch-specific
85 * arch-specific assembly, which in turn call acpi_enter_sleep_state(). 85 * assembly, which in turn call acpi_enter_sleep_state().
86 * It's unfortunate, but it works. Please fix if you're feeling frisky. 86 * It's unfortunate, but it works. Please fix if you're feeling frisky.
87 */ 87 */
88 88
@@ -95,7 +95,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
95 ACPI_FLUSH_CPU_CACHE(); 95 ACPI_FLUSH_CPU_CACHE();
96 96
97 /* Do arch specific saving of state. */ 97 /* Do arch specific saving of state. */
98 if (acpi_state == ACPI_STATE_S2 || acpi_state == ACPI_STATE_S3) { 98 if (acpi_state == ACPI_STATE_S3) {
99 int error = acpi_save_state_mem(); 99 int error = acpi_save_state_mem();
100 100
101 if (error) { 101 if (error) {
@@ -112,7 +112,6 @@ static int acpi_pm_enter(suspend_state_t pm_state)
112 status = acpi_enter_sleep_state(acpi_state); 112 status = acpi_enter_sleep_state(acpi_state);
113 break; 113 break;
114 114
115 case ACPI_STATE_S2:
116 case ACPI_STATE_S3: 115 case ACPI_STATE_S3:
117 do_suspend_lowlevel(); 116 do_suspend_lowlevel();
118 break; 117 break;
@@ -129,7 +128,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
129 printk(KERN_DEBUG "Back to C!\n"); 128 printk(KERN_DEBUG "Back to C!\n");
130 129
131 /* restore processor state */ 130 /* restore processor state */
132 if (acpi_state == ACPI_STATE_S2 || acpi_state == ACPI_STATE_S3) 131 if (acpi_state == ACPI_STATE_S3)
133 acpi_restore_state_mem(); 132 acpi_restore_state_mem();
134 133
135 return ACPI_SUCCESS(status) ? 0 : -EFAULT; 134 return ACPI_SUCCESS(status) ? 0 : -EFAULT;