iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermal: sysfs: Rework the reading of trip point attributes

Browse Source 
Rework the _show() callback functions for the trip point temperature,
hysteresis and type attributes to avoid copying the values of struct
thermal_trip fields that they do not use and make them carry out the
same validation checks as the corresponding _store() callback functions.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2023-12-05 13:26:59 +01:00
parent be0a3600aa
commit 18dfb0e4c3
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/thermal/thermal_sysfs.c
View File

@ -83,25 +83,24 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct thermal_zone_device *tz = to_thermal_zone(dev); struct thermal_zone_device *tz = to_thermal_zone(dev);
struct thermal_trip trip; enum thermal_trip_type type;
int trip_id, result; int trip_id;
if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1) if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1)
return -EINVAL; return -EINVAL;
mutex_lock(&tz->lock); mutex_lock(&tz->lock);
if (device_is_registered(dev)) if (!device_is_registered(dev)) {
result = __thermal_zone_get_trip(tz, trip_id, &trip); mutex_unlock(&tz->lock);
else return -ENODEV;
result = -ENODEV; }
type = tz->trips[trip_id].type;
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
if (result) switch (type) {
return result;
switch (trip.type) {
case THERMAL_TRIP_CRITICAL: case THERMAL_TRIP_CRITICAL:
return sprintf(buf, "critical\n"); return sprintf(buf, "critical\n");
case THERMAL_TRIP_HOT: case THERMAL_TRIP_HOT:
@ -163,25 +162,23 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct thermal_zone_device *tz = to_thermal_zone(dev); struct thermal_zone_device *tz = to_thermal_zone(dev);
struct thermal_trip trip; int trip_id, temp;
int trip_id, ret;
if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1) if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1)
return -EINVAL; return -EINVAL;
mutex_lock(&tz->lock); mutex_lock(&tz->lock);
if (device_is_registered(dev)) if (!device_is_registered(dev)) {
ret = __thermal_zone_get_trip(tz, trip_id, &trip); mutex_unlock(&tz->lock);
else return -ENODEV;
ret = -ENODEV; }
temp = tz->trips[trip_id].temperature;
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
if (ret) return sprintf(buf, "%d\n", temp);
return ret;
return sprintf(buf, "%d\n", trip.temperature);
} }
static ssize_t static ssize_t
@ -232,22 +229,23 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct thermal_zone_device *tz = to_thermal_zone(dev); struct thermal_zone_device *tz = to_thermal_zone(dev);
struct thermal_trip trip; int trip_id, hyst;
int trip_id, ret;
if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1) if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)
return -EINVAL; return -EINVAL;
mutex_lock(&tz->lock); mutex_lock(&tz->lock);
if (device_is_registered(dev)) if (!device_is_registered(dev)) {
ret = __thermal_zone_get_trip(tz, trip_id, &trip); mutex_unlock(&tz->lock);
else return -ENODEV;
ret = -ENODEV; }
hyst = tz->trips[trip_id].hysteresis;
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
return ret ? ret : sprintf(buf, "%d\n", trip.hysteresis); return sprintf(buf, "%d\n", hyst);
} }
static ssize_t static ssize_t