2 files changed, 14 insertions, 62 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 508e2a2c9864..4cd1a5da80a4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -170,11 +170,6 @@ and is between 256 and 4096 characters. It is defined in the file
         acpi_irq_isa=   [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
                         Format: <irq>,<irq>...
 
-        acpi_new_pts_ordering [HW,ACPI]
-                        Enforce the ACPI 2.0 ordering of the _PTS control
-                        method wrt putting devices into low power states
-                        default: pre ACPI 2.0 ordering of _PTS
-
         acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
 
         acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index d2f71a54726c..71183eea7906 100644
--- 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;
@@ -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)