From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 20 Oct 2021 19:10:17 +0000 (+0200)
Subject: ACPI: PM: sleep: Do not set suspend_ops unnecessarily
X-Git-Tag: v6.6.17~8938^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d69d1f708093347c085699cc0b547982e48c47b8;p=platform%2Fkernel%2Flinux-rpi.git

ACPI: PM: sleep: Do not set suspend_ops unnecessarily

If none of the S1 - S3 sleep states is supported, it is not necessary
to register suspend_ops, so don't do that then.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 3023224..eaa4775 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -815,14 +815,18 @@ void __weak acpi_s2idle_setup(void)
 
 static void acpi_sleep_suspend_setup(void)
 {
+	bool suspend_ops_needed = false;
 	int i;
 
 	for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++)
-		if (acpi_sleep_state_supported(i))
+		if (acpi_sleep_state_supported(i)) {
 			sleep_states[i] = 1;
+			suspend_ops_needed = true;
+		}
 
-	suspend_set_ops(old_suspend_ordering ?
-		&acpi_suspend_ops_old : &acpi_suspend_ops);
+	if (suspend_ops_needed)
+		suspend_set_ops(old_suspend_ordering ?
+				&acpi_suspend_ops_old : &acpi_suspend_ops);
 
 	acpi_s2idle_setup();
 }