Commit e5bfcd30 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano
Browse files

thermal/core: Rename 'trips' to 'num_trips' 



In order to use thermal trips defined in the thermal structure, rename
the 'trips' field to 'num_trips' to have the 'trips' field containing the
thermal trip points.

Cc: Alexandre Bailon <abailon@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220722200007.1839356-8-daniel.lezcano@linexp.org


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent e5f2cda6

drivers/thermal/gov_fair_share.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,10 +25,10 @@ static int get_trip_level(struct thermal_zone_device *tz) 
	int trip_temp;

	int trip_temp;

	enum thermal_trip_type trip_type;

	enum thermal_trip_type trip_type;





	if (tz->trips == 0 || !tz->ops->get_trip_temp)

	if (tz->num_trips == 0 || !tz->ops->get_trip_temp)

		return 0;

		return 0;





	for (count = 0; count < tz->trips; count++) {

	for (count = 0; count < tz->num_trips; count++) {

		tz->ops->get_trip_temp(tz, count, &trip_temp);

		tz->ops->get_trip_temp(tz, count, &trip_temp);

		if (tz->temperature < trip_temp)

		if (tz->temperature < trip_temp)

			break;

			break;
@@ -53,7 +53,7 @@ static long get_target_state(struct thermal_zone_device *tz, 




	cdev->ops->get_max_state(cdev, &max_state);

	cdev->ops->get_max_state(cdev, &max_state);





	return (long)(percentage * level * max_state) / (100 * tz->trips);

	return (long)(percentage * level * max_state) / (100 * tz->num_trips);

}

}





/**

/**

drivers/thermal/gov_power_allocator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -527,7 +527,7 @@ static void get_governor_trips(struct thermal_zone_device *tz, 
	last_active = INVALID_TRIP;

	last_active = INVALID_TRIP;

	last_passive = INVALID_TRIP;

	last_passive = INVALID_TRIP;





	for (i = 0; i < tz->trips; i++) {

	for (i = 0; i < tz->num_trips; i++) {

		enum thermal_trip_type type;

		enum thermal_trip_type type;

		int ret;

		int ret;
@@ -668,7 +668,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz) 




	get_governor_trips(tz, params);

	get_governor_trips(tz, params);





	if (tz->trips > 0) {

	if (tz->num_trips > 0) {

		ret = tz->ops->get_trip_temp(tz,

		ret = tz->ops->get_trip_temp(tz,

					params->trip_max_desired_temperature,

					params->trip_max_desired_temperature,

					&control_temp);

					&control_temp);

drivers/thermal/tegra/tegra30-tsensor.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,7 @@ static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd, 
	*hot_trip  = 85000;

	*hot_trip  = 85000;

	*crit_trip = 90000;

	*crit_trip = 90000;





	for (i = 0; i < tzd->trips; i++) {

	for (i = 0; i < tzd->num_trips; i++) {

		enum thermal_trip_type type;

		enum thermal_trip_type type;

		int trip_temp;

		int trip_temp;

drivers/thermal/thermal_core.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -501,7 +501,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, 




	tz->notify_event = event;

	tz->notify_event = event;





	for (count = 0; count < tz->trips; count++)

	for (count = 0; count < tz->num_trips; count++)

		handle_thermal_trip(tz, count);

		handle_thermal_trip(tz, count);

}

}

EXPORT_SYMBOL_GPL(thermal_zone_device_update);

EXPORT_SYMBOL_GPL(thermal_zone_device_update);
@@ -626,7 +626,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	unsigned long max_state;

	unsigned long max_state;

	int result, ret;

	int result, ret;





	if (trip >= tz->trips || trip < 0)

	if (trip >= tz->num_trips || trip < 0)

		return -EINVAL;

		return -EINVAL;





	list_for_each_entry(pos1, &thermal_tz_list, node) {

	list_for_each_entry(pos1, &thermal_tz_list, node) {
@@ -807,7 +807,7 @@ static void __bind(struct thermal_zone_device *tz, int mask, 
{

{

	int i, ret;

	int i, ret;





	for (i = 0; i < tz->trips; i++) {

	for (i = 0; i < tz->num_trips; i++) {

		if (mask & (1 << i)) {

		if (mask & (1 << i)) {

			unsigned long upper, lower;

			unsigned long upper, lower;
@@ -1053,7 +1053,7 @@ static void __unbind(struct thermal_zone_device *tz, int mask, 
{

{

	int i;

	int i;





	for (i = 0; i < tz->trips; i++)

	for (i = 0; i < tz->num_trips; i++)

		if (mask & (1 << i))

		if (mask & (1 << i))

			thermal_zone_unbind_cooling_device(tz, i, cdev);

			thermal_zone_unbind_cooling_device(tz, i, cdev);

}

}
@@ -1165,7 +1165,7 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms 
/**

/**

 * thermal_zone_device_register() - register a new thermal zone device

 * thermal_zone_device_register() - register a new thermal zone device

 * @type:	the thermal zone device type

 * @type:	the thermal zone device type

 * @trips:	the number of trip points the thermal zone support

 * @num_trips:	the number of trip points the thermal zone support

 * @mask:	a bit string indicating the writeablility of trip points

 * @mask:	a bit string indicating the writeablility of trip points

 * @devdata:	private device data

 * @devdata:	private device data

 * @ops:	standard thermal zone device callbacks

 * @ops:	standard thermal zone device callbacks
@@ -1187,7 +1187,7 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms 
 * IS_ERR*() helpers.

 * IS_ERR*() helpers.

 */

 */

struct thermal_zone_device *

struct thermal_zone_device *

thermal_zone_device_register(const char *type, int trips, int mask,

thermal_zone_device_register(const char *type, int num_trips, int mask,

			     void *devdata, struct thermal_zone_device_ops *ops,

			     void *devdata, struct thermal_zone_device_ops *ops,

			     struct thermal_zone_params *tzp, int passive_delay,

			     struct thermal_zone_params *tzp, int passive_delay,

			     int polling_delay)

			     int polling_delay)
@@ -1211,7 +1211,7 @@ thermal_zone_device_register(const char *type, int trips, int mask, 
		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);

	}

	}





	if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips) {

	if (num_trips > THERMAL_MAX_TRIPS || num_trips < 0 || mask >> num_trips) {

		pr_err("Incorrect number of thermal trips\n");

		pr_err("Incorrect number of thermal trips\n");

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);

	}

	}
@@ -1221,7 +1221,7 @@ thermal_zone_device_register(const char *type, int trips, int mask, 
		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);

	}

	}





	if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))

	if (num_trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);





	tz = kzalloc(sizeof(*tz), GFP_KERNEL);

	tz = kzalloc(sizeof(*tz), GFP_KERNEL);
@@ -1251,7 +1251,7 @@ thermal_zone_device_register(const char *type, int trips, int mask, 
	tz->tzp = tzp;

	tz->tzp = tzp;

	tz->device.class = &thermal_class;

	tz->device.class = &thermal_class;

	tz->devdata = devdata;

	tz->devdata = devdata;

	tz->trips = trips;

	tz->num_trips = num_trips;





	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);

	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);

	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);

	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
@@ -1269,7 +1269,7 @@ thermal_zone_device_register(const char *type, int trips, int mask, 
	if (result)

	if (result)

		goto release_device;

		goto release_device;





	for (count = 0; count < trips; count++) {

	for (count = 0; count < num_trips; count++) {

		if (tz->ops->get_trip_type(tz, count, &trip_type) ||

		if (tz->ops->get_trip_type(tz, count, &trip_type) ||

		    tz->ops->get_trip_temp(tz, count, &trip_temp) ||

		    tz->ops->get_trip_temp(tz, count, &trip_temp) ||

		    !trip_temp)

		    !trip_temp)

drivers/thermal/thermal_helpers.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) 
	ret = tz->ops->get_temp(tz, temp);

	ret = tz->ops->get_temp(tz, temp);





	if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {

	if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {

		for (count = 0; count < tz->trips; count++) {

		for (count = 0; count < tz->num_trips; count++) {

			ret = tz->ops->get_trip_type(tz, count, &type);

			ret = tz->ops->get_trip_type(tz, count, &type);

			if (!ret && type == THERMAL_TRIP_CRITICAL) {

			if (!ret && type == THERMAL_TRIP_CRITICAL) {

				ret = tz->ops->get_trip_temp(tz, count,

				ret = tz->ops->get_trip_temp(tz, count,
@@ -137,7 +137,7 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz) 
	if (!tz->ops->set_trips || !tz->ops->get_trip_hyst)

	if (!tz->ops->set_trips || !tz->ops->get_trip_hyst)

		goto exit;

		goto exit;





	for (i = 0; i < tz->trips; i++) {

	for (i = 0; i < tz->num_trips; i++) {

		int trip_low;

		int trip_low;





		tz->ops->get_trip_temp(tz, i, &trip_temp);

		tz->ops->get_trip_temp(tz, i, &trip_temp);