ACPI PM: Restore the 2.6.24 suspend ordering

[linux-2.6-omap-h63xx.git] / drivers / acpi / sleep / main.c

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 485de1347075c812c4c7dbd4347c67cca7bd67b3..71183eea7906fe05424a0500676d31107d119c4e 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -26,21 +26,6 @@ u8 sleep_states[ACPI_S_STATE_COUNT];
 
 #ifdef CONFIG_PM_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
-static bool acpi_sleep_finish_wake_up;
-
-/*
- * ACPI 2.0 and later want us to execute _PTS after suspending devices, so we
- * allow the user to request that behavior by using the 'acpi_new_pts_ordering'
- * kernel command line option that causes the following variable to be set.
- */
-static bool new_pts_ordering;
-
-static int __init acpi_new_pts_ordering(char *str)
-{
-       new_pts_ordering = true;
-       return 1;
-}
-__setup("acpi_new_pts_ordering", acpi_new_pts_ordering);
 #endif
 
 static int acpi_sleep_prepare(u32 acpi_state)
@@ -91,14 +76,6 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 
        if (sleep_states[acpi_state]) {
                acpi_target_sleep_state = acpi_state;
-               if (new_pts_ordering)
-                       return 0;
-
-               error = acpi_sleep_prepare(acpi_state);
-               if (error)
-                       acpi_target_sleep_state = ACPI_STATE_S0;
-               else
-                       acpi_sleep_finish_wake_up = true;
        } else {
                printk(KERN_ERR "ACPI does not support this state: %d\n",
                        pm_state);
@@ -116,14 +93,11 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 
 static int acpi_pm_prepare(void)
 {
-       if (new_pts_ordering) {
-               int error = acpi_sleep_prepare(acpi_target_sleep_state);
+       int error = acpi_sleep_prepare(acpi_target_sleep_state);
 
-               if (error) {
-                       acpi_target_sleep_state = ACPI_STATE_S0;
-                       return error;
-               }
-               acpi_sleep_finish_wake_up = true;
+       if (error) {
+               acpi_target_sleep_state = ACPI_STATE_S0;
+               return error;
        }
 
        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
@@ -170,7 +144,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
        /* Reprogram control registers and execute _BFS */
        acpi_leave_sleep_state_prep(acpi_state);
 
-       /* ACPI 3.0 specs (P62) says that it's the responsabilty
+       /* ACPI 3.0 specs (P62) says that it's the responsibility
         * of the OSPM to clear the status bit [ implying that the
         * POWER_BUTTON event should not reach userspace ]
         */
@@ -212,7 +186,6 @@ static void acpi_pm_finish(void)
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
        acpi_target_sleep_state = ACPI_STATE_S0;
-       acpi_sleep_finish_wake_up = false;
 
 #ifdef CONFIG_X86
        if (init_8259A_after_S1) {
@@ -229,11 +202,10 @@ static void acpi_pm_finish(void)
 static void acpi_pm_end(void)
 {
        /*
-        * This is necessary in case acpi_pm_finish() is not called directly
-        * during a failing transition to a sleep state.
+        * This is necessary in case acpi_pm_finish() is not called during a
+        * failing transition to a sleep state.
         */
-       if (acpi_sleep_finish_wake_up)
-               acpi_pm_finish();
+       acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
 static int acpi_pm_state_valid(suspend_state_t pm_state)
@@ -285,31 +257,18 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #ifdef CONFIG_HIBERNATION
 static int acpi_hibernation_begin(void)
 {
-       int error;
-
        acpi_target_sleep_state = ACPI_STATE_S4;
-       if (new_pts_ordering)
-               return 0;
-
-       error = acpi_sleep_prepare(ACPI_STATE_S4);
-       if (error)
-               acpi_target_sleep_state = ACPI_STATE_S0;
-       else
-               acpi_sleep_finish_wake_up = true;
 
-       return error;
+       return 0;
 }
 
 static int acpi_hibernation_prepare(void)
 {
-       if (new_pts_ordering) {
-               int error = acpi_sleep_prepare(ACPI_STATE_S4);
+       int error = acpi_sleep_prepare(ACPI_STATE_S4);
 
-               if (error) {
-                       acpi_target_sleep_state = ACPI_STATE_S0;
-                       return error;
-               }
-               acpi_sleep_finish_wake_up = true;
+       if (error) {
+               acpi_target_sleep_state = ACPI_STATE_S0;
+               return error;
        }
 
        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
@@ -353,17 +312,15 @@ static void acpi_hibernation_finish(void)
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
        acpi_target_sleep_state = ACPI_STATE_S0;
-       acpi_sleep_finish_wake_up = false;
 }
 
 static void acpi_hibernation_end(void)
 {
        /*
         * This is necessary in case acpi_hibernation_finish() is not called
-        * directly during a failing transition to the sleep state.
+        * during a failing transition to the sleep state.
         */
-       if (acpi_sleep_finish_wake_up)
-               acpi_hibernation_finish();
+       acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
 static int acpi_hibernation_pre_restore(void)
@@ -472,11 +429,20 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
        if (acpi_target_sleep_state == ACPI_STATE_S0 ||
            (wake && adev->wakeup.state.enabled &&
             adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
+               acpi_status status;
+
                acpi_method[3] = 'W';
-               acpi_evaluate_integer(handle, acpi_method, NULL, &d_max);
-               /* Sanity check */
-               if (d_max < d_min)
+               status = acpi_evaluate_integer(handle, acpi_method, NULL,
+                                               &d_max);
+               if (ACPI_FAILURE(status)) {
+                       d_max = d_min;
+               } else if (d_max < d_min) {
+                       /* Warn the user of the broken DSDT */
+                       printk(KERN_WARNING "ACPI: Wrong value from %s\n",
+                               acpi_method);
+                       /* Sanitize it */
                        d_min = d_max;
+               }
        }
 
        if (d_min_p)
@@ -495,7 +461,7 @@ static void acpi_power_off_prepare(void)
 static void acpi_power_off(void)
 {
        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-       printk("%s called\n", __FUNCTION__);
+       printk("%s called\n", __func__);
        local_irq_disable();
        acpi_enable_wakeup_device(ACPI_STATE_S5);
        acpi_enter_sleep_state(ACPI_STATE_S5);