Commit f41f23b0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 8f9025ba

drivers/thermal/thermal_core.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/thermal/thermal_debugfs.c

+1 −9
Original line number Diff line number Diff line
@@ -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,

drivers/thermal/thermal_sysfs.c

+1 −12
Original line number Diff line number Diff line
@@ -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

drivers/thermal/thermal_trip.c

+15 −0
Original line number Diff line number Diff line
@@ -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)