ACPI: thermal: Clean up acpi_thermal_register_thermal_zone()

Rename the trips variable in acpi_thermal_register_thermal_zone() to
trip_count so its name better reflects the purpose, rearrange white
space in the loop over active trips for clarity and reduce code
duplication related to calling thermal_zone_device_register() by
using an extra local variable to store the passive delay value.

No intentional functional impact.

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

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 45a32b0..4db33da 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -740,33 +740,29 @@ static void acpi_thermal_zone_sysfs_remove(struct acpi_thermal *tz)
 
 static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
 {
-       int trips = 0;
+       int passive_delay = 0;
+       int trip_count = 0;
        int result;
        int i;
 
        if (tz->trips.critical.valid)
-               trips++;
+               trip_count++;
 
        if (tz->trips.hot.valid)
-               trips++;
+               trip_count++;
 
-       if (tz->trips.passive.valid)
-               trips++;
-
-       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->trips.active[i].valid;
-            i++, trips++);
+       if (tz->trips.passive.valid) {
+               trip_count++;
+               passive_delay = tz->trips.passive.tsp * 100;
+       }
 
-       if (tz->trips.passive.valid)
-               tz->thermal_zone = thermal_zone_device_register("acpitz", trips, 0, tz,
-                                                               &acpi_thermal_zone_ops, NULL,
-                                                               tz->trips.passive.tsp * 100,
-                                                               tz->polling_frequency * 100);
-       else
-               tz->thermal_zone =
-                       thermal_zone_device_register("acpitz", trips, 0, tz,
-                                                    &acpi_thermal_zone_ops, NULL,
-                                                    0, tz->polling_frequency * 100);
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->trips.active[i].valid; i++)
+               trip_count++;
 
+       tz->thermal_zone = thermal_zone_device_register("acpitz", trip_count, 0,
+                                                       tz, &acpi_thermal_zone_ops,
+                                                       NULL, passive_delay,
+                                                       tz->polling_frequency * 100);
        if (IS_ERR(tz->thermal_zone))
                return -ENODEV;