Commit 0ac66e51 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Rename function argument related to trip crossing 



Rename the 'crossed_up' function argument to 'upward', which is more
proper English and a better match for representing temperature change
direction, everywhere in the code.

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/2360961.ElGaqSPkdT@rjwysocki.net


[ rjw: Rebased ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e86001d6

drivers/thermal/gov_bang_bang.c

+3 −3
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ static void bang_bang_set_instance_target(struct thermal_instance *instance, 
 * bang_bang_trip_crossed - controls devices associated with the given zone

 * @tz: thermal_zone_device

 * @trip: the trip point

 * @crossed_up: whether or not the trip has been crossed on the way up

 * @upward: whether or not the trip has been crossed on the way up

 */

static void bang_bang_trip_crossed(struct thermal_zone_device *tz,

				   const struct thermal_trip *trip,

				   bool crossed_up)

				   bool upward)

{

	const struct thermal_trip_desc *td = trip_to_trip_desc(trip);

	struct thermal_instance *instance;
@@ -74,7 +74,7 @@ static void bang_bang_trip_crossed(struct thermal_zone_device *tz, 
		tz->temperature, trip->hysteresis);



	list_for_each_entry(instance, &td->thermal_instances, trip_node)

		bang_bang_set_instance_target(instance, crossed_up);

		bang_bang_set_instance_target(instance, upward);

}



static void bang_bang_manage(struct thermal_zone_device *tz)

drivers/thermal/gov_user_space.c

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ static int user_space_bind(struct thermal_zone_device *tz) 
 * user_space_trip_crossed - Notify user space about trip crossing events

 * @tz: thermal_zone_device

 * @trip: trip point

 * @crossed_up: whether or not the trip has been crossed on the way up

 * @upward: whether or not the trip has been crossed on the way up

 *

 * This function notifies the user space through UEvents.

 */

static void user_space_trip_crossed(struct thermal_zone_device *tz,

				    const struct thermal_trip *trip,

				    bool crossed_up)

				    bool upward)

{

	char *thermal_prop[5];

	int i;

drivers/thermal/thermal_core.c

+5 −5
Original line number Diff line number Diff line
@@ -453,23 +453,23 @@ static void move_to_trips_invalid(struct thermal_zone_device *tz, 
static void thermal_governor_trip_crossed(struct thermal_governor *governor,

					  struct thermal_zone_device *tz,

					  const struct thermal_trip *trip,

					  bool crossed_up)

					  bool upward)

{

	if (trip->type == THERMAL_TRIP_HOT || trip->type == THERMAL_TRIP_CRITICAL)

		return;



	if (governor->trip_crossed)

		governor->trip_crossed(tz, trip, crossed_up);

		governor->trip_crossed(tz, trip, upward);

}



static void thermal_trip_crossed(struct thermal_zone_device *tz,

				 struct thermal_trip_desc *td,

				 struct thermal_governor *governor,

				 bool crossed_up)

				 bool upward)

{

	const struct thermal_trip *trip = &td->trip;



	if (crossed_up) {

	if (upward) {

		if (trip->type == THERMAL_TRIP_PASSIVE)

			tz->passive++;

		else if (trip->type == THERMAL_TRIP_CRITICAL ||
@@ -486,7 +486,7 @@ static void thermal_trip_crossed(struct thermal_zone_device *tz, 
		thermal_notify_tz_trip_down(tz, trip);

		thermal_debug_tz_trip_down(tz, trip);

	}

	thermal_governor_trip_crossed(governor, tz, trip, crossed_up);

	thermal_governor_trip_crossed(governor, tz, trip, upward);

}



void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,

drivers/thermal/thermal_core.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct thermal_governor { 
	void (*unbind_from_tz)(struct thermal_zone_device *tz);

	void (*trip_crossed)(struct thermal_zone_device *tz,

			     const struct thermal_trip *trip,

			     bool crossed_up);

			     bool upward);

	void (*manage)(struct thermal_zone_device *tz);

	void (*update_tz)(struct thermal_zone_device *tz,

			  enum thermal_notify_event reason);