thermal: trip: Use common set of trip type names

Use the same set of trip type names in sysfs and in the thermal debug
code output.

No intentional 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_core.h b/drivers/thermal/thermal_core.h
index 20e7b45673d683064209f63ecb0d4cb1b2f5fbdb..afb00b567e680c0206f92edf25b231ea5bf9bddc 100644 (file)
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -240,6 +240,8 @@ void thermal_governor_update_tz(struct thermal_zone_device *tz,
 #define trip_to_trip_desc(__trip)      \
        container_of(__trip, struct thermal_trip_desc, trip)
 
+const char *thermal_trip_type_name(enum thermal_trip_type trip_type);
+
 void __thermal_zone_set_trips(struct thermal_zone_device *tz);
 int thermal_zone_trip_id(const struct thermal_zone_device *tz,
                         const struct thermal_trip *trip);

diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index d83263101ec3b727711e70e74bb51e478d31c3f9..7dd67bf4857198a81d91eb9b9a384afd27227bb0 100644 (file)
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -784,7 +784,6 @@ static int tze_seq_show(struct seq_file *s, void *v)
        struct thermal_zone_device *tz = thermal_dbg->tz_dbg.tz;
        struct thermal_trip_desc *td;
        struct tz_episode *tze;
-       const char *type;
        u64 duration_ms;
        int trip_id;
        char c;
@@ -824,13 +823,6 @@ static int tze_seq_show(struct seq_file *s, void *v)
                if (trip_stats->trip_temp == THERMAL_TEMP_INVALID)
                        continue;
 
-               if (trip->type == THERMAL_TRIP_PASSIVE)
-                       type = "passive";
-               else if (trip->type == THERMAL_TRIP_ACTIVE)
-                       type = "active";
-               else
-                       type = "hot";
-
                if (trip_stats->timestamp != KTIME_MAX) {
                        /* Mitigation in progress. */
                        ktime_t delta = ktime_sub(ktime_get(),
@@ -846,7 +838,7 @@ static int tze_seq_show(struct seq_file *s, void *v)
 
                seq_printf(s, "| %*d | %*s | %*d | %*d | %c%*lld | %*d | %*d |\n",
                           4 , trip_id,
-                          8, type,
+                          8, thermal_trip_type_name(trip->type),
                           9, trip_stats->trip_temp,
                           9, trip_stats->trip_hyst,
                           c, 11, duration_ms,

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 88211ccdfbd62d088c1b45a2cb70bc525c8641bf..e65bbbbf0054a060131eddadf6d22f522b764f46 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -88,18 +88,7 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
        if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1)
                return -EINVAL;
 
-       switch (tz->trips[trip_id].trip.type) {
-       case THERMAL_TRIP_CRITICAL:
-               return sprintf(buf, "critical\n");
-       case THERMAL_TRIP_HOT:
-               return sprintf(buf, "hot\n");
-       case THERMAL_TRIP_PASSIVE:
-               return sprintf(buf, "passive\n");
-       case THERMAL_TRIP_ACTIVE:
-               return sprintf(buf, "active\n");
-       default:
-               return sprintf(buf, "unknown\n");
-       }
+       return sprintf(buf, "%s\n", thermal_trip_type_name(tz->trips[trip_id].trip.type));
 }
 
 static ssize_t

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 49e63db685172e44a7f3c83a2df958bc5d839d90..1ffb5aeab7fb6136f87b90b61bc8fd85d2282cf1 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -9,6 +9,21 @@
  */
 #include "thermal_core.h"
 
+static const char *trip_type_names[] = {
+       [THERMAL_TRIP_ACTIVE] = "active",
+       [THERMAL_TRIP_PASSIVE] = "passive",
+       [THERMAL_TRIP_HOT] = "hot",
+       [THERMAL_TRIP_CRITICAL] = "critical",
+};
+
+const char *thermal_trip_type_name(enum thermal_trip_type trip_type)
+{
+       if (trip_type < THERMAL_TRIP_ACTIVE || trip_type > THERMAL_TRIP_CRITICAL)
+               return "unknown";
+
+       return trip_type_names[trip_type];
+}
+
 int for_each_thermal_trip(struct thermal_zone_device *tz,
                          int (*cb)(struct thermal_trip *, void *),
                          void *data)