Skip to content

Commit 0ac66e5

Browse files
committed
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Link: https://patch.msgid.link/2360961.ElGaqSPkdT@rjwysocki.net [ rjw: Rebased ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent e86001d commit 0ac66e5

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

drivers/thermal/gov_bang_bang.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ static void bang_bang_set_instance_target(struct thermal_instance *instance,
5858
* bang_bang_trip_crossed - controls devices associated with the given zone
5959
* @tz: thermal_zone_device
6060
* @trip: the trip point
61-
* @crossed_up: whether or not the trip has been crossed on the way up
61+
* @upward: whether or not the trip has been crossed on the way up
6262
*/
6363
static void bang_bang_trip_crossed(struct thermal_zone_device *tz,
6464
const struct thermal_trip *trip,
65-
bool crossed_up)
65+
bool upward)
6666
{
6767
const struct thermal_trip_desc *td = trip_to_trip_desc(trip);
6868
struct thermal_instance *instance;
@@ -74,7 +74,7 @@ static void bang_bang_trip_crossed(struct thermal_zone_device *tz,
7474
tz->temperature, trip->hysteresis);
7575

7676
list_for_each_entry(instance, &td->thermal_instances, trip_node)
77-
bang_bang_set_instance_target(instance, crossed_up);
77+
bang_bang_set_instance_target(instance, upward);
7878
}
7979

8080
static void bang_bang_manage(struct thermal_zone_device *tz)

drivers/thermal/gov_user_space.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ static int user_space_bind(struct thermal_zone_device *tz)
2626
* user_space_trip_crossed - Notify user space about trip crossing events
2727
* @tz: thermal_zone_device
2828
* @trip: trip point
29-
* @crossed_up: whether or not the trip has been crossed on the way up
29+
* @upward: whether or not the trip has been crossed on the way up
3030
*
3131
* This function notifies the user space through UEvents.
3232
*/
3333
static void user_space_trip_crossed(struct thermal_zone_device *tz,
3434
const struct thermal_trip *trip,
35-
bool crossed_up)
35+
bool upward)
3636
{
3737
char *thermal_prop[5];
3838
int i;

drivers/thermal/thermal_core.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,23 +453,23 @@ static void move_to_trips_invalid(struct thermal_zone_device *tz,
453453
static void thermal_governor_trip_crossed(struct thermal_governor *governor,
454454
struct thermal_zone_device *tz,
455455
const struct thermal_trip *trip,
456-
bool crossed_up)
456+
bool upward)
457457
{
458458
if (trip->type == THERMAL_TRIP_HOT || trip->type == THERMAL_TRIP_CRITICAL)
459459
return;
460460

461461
if (governor->trip_crossed)
462-
governor->trip_crossed(tz, trip, crossed_up);
462+
governor->trip_crossed(tz, trip, upward);
463463
}
464464

465465
static void thermal_trip_crossed(struct thermal_zone_device *tz,
466466
struct thermal_trip_desc *td,
467467
struct thermal_governor *governor,
468-
bool crossed_up)
468+
bool upward)
469469
{
470470
const struct thermal_trip *trip = &td->trip;
471471

472-
if (crossed_up) {
472+
if (upward) {
473473
if (trip->type == THERMAL_TRIP_PASSIVE)
474474
tz->passive++;
475475
else if (trip->type == THERMAL_TRIP_CRITICAL ||
@@ -486,7 +486,7 @@ static void thermal_trip_crossed(struct thermal_zone_device *tz,
486486
thermal_notify_tz_trip_down(tz, trip);
487487
thermal_debug_tz_trip_down(tz, trip);
488488
}
489-
thermal_governor_trip_crossed(governor, tz, trip, crossed_up);
489+
thermal_governor_trip_crossed(governor, tz, trip, upward);
490490
}
491491

492492
void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,

drivers/thermal/thermal_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct thermal_governor {
5656
void (*unbind_from_tz)(struct thermal_zone_device *tz);
5757
void (*trip_crossed)(struct thermal_zone_device *tz,
5858
const struct thermal_trip *trip,
59-
bool crossed_up);
59+
bool upward);
6060
void (*manage)(struct thermal_zone_device *tz);
6161
void (*update_tz)(struct thermal_zone_device *tz,
6262
enum thermal_notify_event reason);

0 commit comments

Comments
 (0)