Commit 91b3aafc authored by Guenter Roeck's avatar Guenter Roeck Committed by Rafael J. Wysocki
Browse files

thermal/core: Remove thermal_zone_set_trips() 



Since no callers of thermal_zone_set_trips() are left, remove the function.
Document __thermal_zone_set_trips() instead. Explicitly state that the
thermal zone lock must be held when calling the function, and that the
pointer to the thermal zone must be valid.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 05eeee2b

drivers/thermal/thermal_core.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz, 
				  enum thermal_notify_event event);



/* Helpers */

void thermal_zone_set_trips(struct thermal_zone_device *tz);

void __thermal_zone_set_trips(struct thermal_zone_device *tz);

int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);

drivers/thermal/thermal_helpers.c

+15 −19
Original line number Diff line number Diff line
@@ -147,6 +147,21 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) 
}

EXPORT_SYMBOL_GPL(thermal_zone_get_temp);



/**

 * __thermal_zone_set_trips - Computes the next trip points for the driver

 * @tz: a pointer to a thermal zone device structure

 *

 * The function computes the next temperature boundaries by browsing

 * the trip points. The result is the closer low and high trip points

 * to the current temperature. These values are passed to the backend

 * driver to let it set its own notification mechanism (usually an

 * interrupt).

 *

 * This function must be called with tz->lock held. Both tz and tz->ops

 * must be valid pointers.

 *

 * It does not return a value

 */

void __thermal_zone_set_trips(struct thermal_zone_device *tz)

{

	int low = -INT_MAX;
@@ -193,25 +208,6 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz) 
		dev_err(&tz->device, "Failed to set trips: %d\n", ret);

}



/**

 * thermal_zone_set_trips - Computes the next trip points for the driver

 * @tz: a pointer to a thermal zone device structure

 *

 * The function computes the next temperature boundaries by browsing

 * the trip points. The result is the closer low and high trip points

 * to the current temperature. These values are passed to the backend

 * driver to let it set its own notification mechanism (usually an

 * interrupt).

 *

 * It does not return a value

 */

void thermal_zone_set_trips(struct thermal_zone_device *tz)

{

	mutex_lock(&tz->lock);

	__thermal_zone_set_trips(tz);

	mutex_unlock(&tz->lock);

}



static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,

				       int target)

{