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

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

Documentation/driver-api/thermal/sysfs-api.rst

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

temperature values.



4.2. get_thermal_instance

-------------------------



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

4.2. thermal_cdev_update

------------------------



This function serves as an arbitrator to set the state of a cooling

drivers/thermal/thermal_core.h

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



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

 * a certain cooling device on a certain trip point

drivers/thermal/thermal_helpers.c

+6 −24
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip 
	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,

				     const struct thermal_trip *trip)

{
@@ -47,10 +47,10 @@ static struct thermal_instance *get_instance(struct thermal_zone_device *tz, 


	list_for_each_entry(ti, &tz->thermal_instances, tz_node) {

		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,
@@ -62,7 +62,7 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, 
	mutex_lock(&tz->lock);

	mutex_lock(&cdev->lock);



	ret = !!get_instance(tz, cdev, trip);

	ret = thermal_instance_present(tz, cdev, trip);



	mutex_unlock(&cdev->lock);

	mutex_unlock(&tz->lock);
@@ -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);



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

 * @tz: a valid pointer to a struct thermal_zone_device