[v1] ACPI: thermal: Fold acpi_thermal_get_info() into its caller

Commit Message

Rafael J. Wysocki Aug. 10, 2023, 6:44 p.m. UTC

From: Rafael J. Wysocki <[e-mail]>

Commit dabc621a3110 ("ACPI: thermal: Drop enabled flag from struct
acpi_thermal_active") left behind a variable that is only assigned to
and never read, so drop it now.

Fixes: dabc621a3110 ("ACPI: thermal: Drop enabled flag from struct acpi_thermal_active")
Signed-off-by: Rafael J. Wysocki <[e-mail]>
---

The commit mentioned above is a linux-next one.

---
 drivers/acpi/thermal.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

Index: linux-pm/drivers/acpi/thermal.c
===================================================================
--- linux-pm.orig/drivers/acpi/thermal.c
+++ linux-pm/drivers/acpi/thermal.c
@@ -1039,7 +1039,7 @@  static int acpi_thermal_suspend(struct d
 static int acpi_thermal_resume(struct device *dev)
 {
 	struct acpi_thermal *tz;
-	int i, j, power_state, result;
+	int i, j, power_state;
 
 	if (!dev)
 		return -EINVAL;
@@ -1053,9 +1053,8 @@  static int acpi_thermal_resume(struct de
 			break;
 
 		for (j = 0; j < tz->trips.active[i].devices.count; j++) {
-			result = acpi_bus_update_power(
-					tz->trips.active[i].devices.handles[j],
-					&power_state);
+			acpi_bus_update_power(tz->trips.active[i].devices.handles[j],
+					      &power_state);
 		}
 	}