thermal/debugfs: Move some statements from under thermal_dbg->lock

The tz_dbg local variable assignments in thermal_debug_tz_trip_up(),
thermal_debug_tz_trip_down(), and thermal_debug_update_trip_stats()
need not be carried out under thermal_dbg->lock, so move them from
under that lock (to avoid possible future confusion).

While at it, reorder local variable definitions in
thermal_debug_tz_trip_up() for more clarity.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index dbfe678..d832631 100644 (file)
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -574,20 +574,20 @@ static struct tz_episode *thermal_debugfs_tz_event_alloc(struct thermal_zone_dev
 void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
                              const struct thermal_trip *trip)
 {
-       struct tz_episode *tze;
-       struct tz_debugfs *tz_dbg;
        struct thermal_debugfs *thermal_dbg = tz->debugfs;
        int trip_id = thermal_zone_trip_id(tz, trip);
        ktime_t now = ktime_get();
        struct trip_stats *trip_stats;
+       struct tz_debugfs *tz_dbg;
+       struct tz_episode *tze;
 
        if (!thermal_dbg)
                return;
 
-       mutex_lock(&thermal_dbg->lock);
-
        tz_dbg = &thermal_dbg->tz_dbg;
 
+       mutex_lock(&thermal_dbg->lock);
+
        /*
         * The mitigation is starting. A mitigation can contain
         * several episodes where each of them is related to a
@@ -677,10 +677,10 @@ void thermal_debug_tz_trip_down(struct thermal_zone_device *tz,
        if (!thermal_dbg)
                return;
 
-       mutex_lock(&thermal_dbg->lock);
-
        tz_dbg = &thermal_dbg->tz_dbg;
 
+       mutex_lock(&thermal_dbg->lock);
+
        /*
         * The temperature crosses the way down but there was not
         * mitigation detected before. That may happen when the
@@ -729,10 +729,10 @@ void thermal_debug_update_trip_stats(struct thermal_zone_device *tz)
        if (!thermal_dbg)
                return;
 
-       mutex_lock(&thermal_dbg->lock);
-
        tz_dbg = &thermal_dbg->tz_dbg;
 
+       mutex_lock(&thermal_dbg->lock);
+
        if (!tz_dbg->nr_trips)
                goto out;