[PATCH v3 2/2] thermal: sysfs: Rework the reading of trip point attributes

Rafael J. Wysocki
2023-12-04T14:52:55Z

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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 to make them carry out
validation checks with the help of check_thermal_zone_and_trip_id(),
like the corresponding _store() callback functions.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

v2 -> v3: Drop a redundant 'ret' check at the end of trip_point_hyst_show.

v1 -> v2: Do not drop thermal zone locking from the _store() callback functions.

---
drivers/thermal/thermal_sysfs.c | 55 ++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 27 deletions(-)

Index: linux-pm/drivers/thermal/thermal_sysfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_sysfs.c
+++ linux-pm/drivers/thermal/thermal_sysfs.c
@@ -96,25 +96,25 @@ trip_point_type_show(struct device *dev,
char *buf)
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
- struct thermal_trip trip;
- int trip_id, result;
+ enum thermal_trip_type type;
+ int trip_id, ret;

if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1)
return -EINVAL;

mutex_lock(&tz->lock);

- if (device_is_registered(dev))
- result = __thermal_zone_get_trip(tz, trip_id, &trip);
- else
- result = -ENODEV;
+ ret = check_thermal_zone_and_trip_id(dev, tz, trip_id);
+ if (ret) {
+ mutex_unlock(&tz->lock);
+ return ret;
+ }

- mutex_unlock(&tz->lock);
+ type = tz->trips[trip_id].type;

- if (result)
- return result;
+ mutex_unlock(&tz->lock);

- switch (trip.type) {
+ switch (type) {
case THERMAL_TRIP_CRITICAL:
return sprintf(buf, "critical\n");
case THERMAL_TRIP_HOT:
@@ -175,25 +175,24 @@ trip_point_temp_show(struct device *dev,
char *buf)
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
- struct thermal_trip trip;
- int trip_id, ret;
+ int trip_id, ret, temp;

if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1)
return -EINVAL;

mutex_lock(&tz->lock);

- if (device_is_registered(dev))
- ret = __thermal_zone_get_trip(tz, trip_id, &trip);
- else
- ret = -ENODEV;
+ ret = check_thermal_zone_and_trip_id(dev, tz, trip_id);
+ if (ret) {
+ mutex_unlock(&tz->lock);
+ return ret;
+ }

- mutex_unlock(&tz->lock);
+ temp = tz->trips[trip_id].temperature;

- if (ret)
- return ret;
+ mutex_unlock(&tz->lock);

- return sprintf(buf, "%d\n", trip.temperature);
+ return sprintf(buf, "%d\n", temp);
}

static ssize_t
@@ -243,22 +242,24 @@ trip_point_hyst_show(struct device *dev,
char *buf)
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
- struct thermal_trip trip;
- int trip_id, ret;
+ int trip_id, ret, hyst;

if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)
return -EINVAL;

mutex_lock(&tz->lock);

- if (device_is_registered(dev))
- ret = __thermal_zone_get_trip(tz, trip_id, &trip);
- else
- ret = -ENODEV;
+ ret = check_thermal_zone_and_trip_id(dev, tz, trip_id);
+ if (ret) {
+ mutex_unlock(&tz->lock);
+ return ret;
+ }
+
+ hyst = tz->trips[trip_id].hysteresis;

mutex_unlock(&tz->lock);

- return ret ? ret : sprintf(buf, "%d\n", trip.hysteresis);
+ return sprintf(buf, "%d\n", hyst);
}

static ssize_t