ACPI: thermal: Replace ternary operator with min_t()

Modify the code in accordance with the coccicheck warning:

drivers/acpi/thermal.c:422: WARNING opportunity for min().

min_t() macro is defined in include/linux/minmax.h. It avoids multiple
evaluations of the arguments when non-constant and performs strict
type-checking.

Signed-off-by: Jiangshan Yi <yijiangshan@kylinos.cn>
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0b4b844..179f411 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -419,10 +419,9 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                         * the next higher trip point
                                         */
                                        tz->trips.active[i-1].temperature =
-                                               (tz->trips.active[i-2].temperature <
-                                               celsius_to_deci_kelvin(act) ?
-                                               tz->trips.active[i-2].temperature :
-                                               celsius_to_deci_kelvin(act));
+                                               min_t(unsigned long,
+                                                     tz->trips.active[i-2].temperature,
+                                                     celsius_to_deci_kelvin(act));
 
                                break;
                        } else {