thermal: core: Add function to walk trips under zone lock

Add a wrapper around for_each_thermal_trip(), called
thermal_zone_for_each_trip(), that will invoke the former under the
thermal zone lock and pass its return value to the caller.

Two drivers will be modified subsequently to use this new function.

No functional impact.

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

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index a8e92a89b2b8ad6ca52c437d7396c3bdb9914de9..8c649a899537577a2f172f22f550a073190a6aa7 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -27,6 +27,20 @@ int for_each_thermal_trip(struct thermal_zone_device *tz,
 }
 EXPORT_SYMBOL_GPL(for_each_thermal_trip);
 
+int thermal_zone_for_each_trip(struct thermal_zone_device *tz,
+                              int (*cb)(struct thermal_trip *, void *),
+                              void *data)
+{
+       int ret;
+
+       mutex_lock(&tz->lock);
+       ret = for_each_thermal_trip(tz, cb, data);
+       mutex_unlock(&tz->lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(thermal_zone_for_each_trip);
+
 int thermal_zone_get_num_trips(struct thermal_zone_device *tz)
 {
        return tz->num_trips;

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 6710a4ace992af48c1974ac2abc2ffc84697352b..2bab72149bbfe142b64cf975dd291d3213048769 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -286,6 +286,9 @@ int thermal_zone_set_trip(struct thermal_zone_device *tz, int trip_id,
 int for_each_thermal_trip(struct thermal_zone_device *tz,
                          int (*cb)(struct thermal_trip *, void *),
                          void *data);
+int thermal_zone_for_each_trip(struct thermal_zone_device *tz,
+                              int (*cb)(struct thermal_trip *, void *),
+                              void *data);
 int thermal_zone_get_num_trips(struct thermal_zone_device *tz);
 
 int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp);