ACPI: PM: Loop in full LPS0 mode only

rafaeljw · rafaeljw · commit 7edcbbf29006 · 2018-12-18T10:51:16.000+01:00
After a previous change, all non-wakeup GPEs are disabled for
suspend-to-idle unless full Low-Power S0 (LPS0) mode is in use, so
it is not necessary to do anything in acpi_s2idle_wake() unless in
full LPS0 mode, which is only when lps0_device_handle is set.

Modify the code accordingly.

Tested-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
@@ -985,6 +985,8 @@ static int acpi_s2idle_prepare(void)
 
 static void acpi_s2idle_wake(void)
 {
+	if (!lps0_device_handle)
+		return;
 
 	if (pm_debug_messages_on)
 		lpi_check_constraints();
@@ -1003,8 +1005,7 @@ static void acpi_s2idle_wake(void)
 		 * takes too much time for EC wakeup events to survive, so look
 		 * for them now.
 		 */
-		if (lps0_device_handle)
-			acpi_ec_dispatch_gpe();
+		acpi_ec_dispatch_gpe();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -985,6 +985,8 @@ static int acpi_s2idle_prepare(void)`
`985`	`985`
`986`	`986`	`static void acpi_s2idle_wake(void)`
`987`	`987`	`{`
	`988`	`+ if (!lps0_device_handle)`
	`989`	`+ return;`
`988`	`990`
`989`	`991`	`if (pm_debug_messages_on)`
`990`	`992`	`lpi_check_constraints();`
`@@ -1003,8 +1005,7 @@ static void acpi_s2idle_wake(void)`
`1003`	`1005`	`* takes too much time for EC wakeup events to survive, so look`
`1004`	`1006`	`* for them now.`
`1005`	`1007`	`*/`
`1006`		`- if (lps0_device_handle)`
`1007`		`- acpi_ec_dispatch_gpe();`
	`1008`	`+ acpi_ec_dispatch_gpe();`
`1008`	`1009`	`}`
`1009`	`1010`	`}`
`1010`	`1011`