drivers/thermal/core: Optimize trip points check

The trip points are checked one by one with multiple condition
branches where one condition is enough to disable the trip point.

Merge all these conditions in a single 'OR' statement.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
Suggested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201027013743.62392-1-bernard@vivo.com
[dlezcano] Changed patch description

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 96349ba5972510ddc755e2ace9458e4a8fb9462c..90e38cc199f402368b7a33497c4aadef9c1cf905 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1358,12 +1358,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,
                goto release_device;
 
        for (count = 0; count < trips; count++) {
-               if (tz->ops->get_trip_type(tz, count, &trip_type))
-                       set_bit(count, &tz->trips_disabled);
-               if (tz->ops->get_trip_temp(tz, count, &trip_temp))
-                       set_bit(count, &tz->trips_disabled);
-               /* Check for bogus trip points */
-               if (trip_temp == 0)
+               if (tz->ops->get_trip_type(tz, count, &trip_type) ||
+                   tz->ops->get_trip_temp(tz, count, &trip_temp) ||
+                   !trip_temp)
                        set_bit(count, &tz->trips_disabled);
        }