thermal: core: Introduce thermal_governor_trip_crossed()

Add a wrapper around the .trip_crossed() governor callback invocation
to reduce code duplications slightly and improve the code layout in
__thermal_zone_device_update().

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4debd3c9f3271730e1db1143be3f6e2a2dbfdbc1..64036372e240c412810d674b38c0eb928c406629 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -450,6 +450,15 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz)
                pos->initialized = false;
 }
 
+static void thermal_governor_trip_crossed(struct thermal_governor *governor,
+                                         struct thermal_zone_device *tz,
+                                         const struct thermal_trip *trip,
+                                         bool crossed_up)
+{
+       if (governor->trip_crossed)
+               governor->trip_crossed(tz, trip, crossed_up);
+}
+
 static int thermal_trip_notify_cmp(void *ascending, const struct list_head *a,
                                   const struct list_head *b)
 {
@@ -489,16 +498,14 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
        list_for_each_entry(td, &way_up_list, notify_list_node) {
                thermal_notify_tz_trip_up(tz, &td->trip);
                thermal_debug_tz_trip_up(tz, &td->trip);
-               if (governor->trip_crossed)
-                       governor->trip_crossed(tz, &td->trip, true);
+               thermal_governor_trip_crossed(governor, tz, &td->trip, true);
        }
 
        list_sort(NULL, &way_down_list, thermal_trip_notify_cmp);
        list_for_each_entry(td, &way_down_list, notify_list_node) {
                thermal_notify_tz_trip_down(tz, &td->trip);
                thermal_debug_tz_trip_down(tz, &td->trip);
-               if (governor->trip_crossed)
-                       governor->trip_crossed(tz, &td->trip, false);
+               thermal_governor_trip_crossed(governor, tz, &td->trip, false);
        }
 
        if (governor->manage)