Commit 96d81990 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

thermal: helpers: Drop get_thermal_instance()

There are no more users of get_thermal_instance(), so drop it.

While at it, replace get_instance() returning a pointer to struct
thermal_instance with thermal_instance_present() returning a bool
which is more straightforward.

No functional impact.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/2014591.usQuhbGJ8B@rjwysocki.net
[ rjw: Dropped get_thermal_instance() documentation ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5136f99b
...@@ -459,14 +459,7 @@ are supposed to implement the callback. If they don't, the thermal ...@@ -459,14 +459,7 @@ are supposed to implement the callback. If they don't, the thermal
framework calculated the trend by comparing the previous and the current framework calculated the trend by comparing the previous and the current
temperature values. temperature values.
4.2. get_thermal_instance 4.2. thermal_cdev_update
-------------------------
This function returns the thermal_instance corresponding to a given
{thermal_zone, cooling_device, trip_point} combination. Returns NULL
if such an instance does not exist.
4.3. thermal_cdev_update
------------------------ ------------------------
This function serves as an arbitrator to set the state of a cooling This function serves as an arbitrator to set the state of a cooling
......
...@@ -204,11 +204,6 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev); ...@@ -204,11 +204,6 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev);
int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip); int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip);
struct thermal_instance *
get_thermal_instance(struct thermal_zone_device *tz,
struct thermal_cooling_device *cdev,
int trip);
/* /*
* This structure is used to describe the behavior of * This structure is used to describe the behavior of
* a certain cooling device on a certain trip point * a certain cooling device on a certain trip point
......
...@@ -39,18 +39,18 @@ int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip ...@@ -39,18 +39,18 @@ int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip
return trend; return trend;
} }
static struct thermal_instance *get_instance(struct thermal_zone_device *tz, static bool thermal_instance_present(struct thermal_zone_device *tz,
struct thermal_cooling_device *cdev, struct thermal_cooling_device *cdev,
const struct thermal_trip *trip) const struct thermal_trip *trip)
{ {
struct thermal_instance *ti; struct thermal_instance *ti;
list_for_each_entry(ti, &tz->thermal_instances, tz_node) { list_for_each_entry(ti, &tz->thermal_instances, tz_node) {
if (ti->trip == trip && ti->cdev == cdev) if (ti->trip == trip && ti->cdev == cdev)
return ti; return true;
} }
return NULL; return false;
} }
bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz,
...@@ -62,7 +62,7 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, ...@@ -62,7 +62,7 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz,
mutex_lock(&tz->lock); mutex_lock(&tz->lock);
mutex_lock(&cdev->lock); mutex_lock(&cdev->lock);
ret = !!get_instance(tz, cdev, trip); ret = thermal_instance_present(tz, cdev, trip);
mutex_unlock(&cdev->lock); mutex_unlock(&cdev->lock);
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
...@@ -71,24 +71,6 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, ...@@ -71,24 +71,6 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz,
} }
EXPORT_SYMBOL_GPL(thermal_trip_is_bound_to_cdev); EXPORT_SYMBOL_GPL(thermal_trip_is_bound_to_cdev);
struct thermal_instance *
get_thermal_instance(struct thermal_zone_device *tz,
struct thermal_cooling_device *cdev, int trip_index)
{
struct thermal_instance *ti;
mutex_lock(&tz->lock);
mutex_lock(&cdev->lock);
ti = get_instance(tz, cdev, &tz->trips[trip_index].trip);
mutex_unlock(&cdev->lock);
mutex_unlock(&tz->lock);
return ti;
}
EXPORT_SYMBOL(get_thermal_instance);
/** /**
* __thermal_zone_get_temp() - returns the temperature of a thermal zone * __thermal_zone_get_temp() - returns the temperature of a thermal zone
* @tz: a valid pointer to a struct thermal_zone_device * @tz: a valid pointer to a struct thermal_zone_device
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment