thermal: core: Rename callback functions in two governors

The names of :trip_crossed() callback functions in the Bang-bang and
User-space thermal governors don't match their current purpose any
more after previous changes, so rename them.

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/5859084.DvuYhMxLoT@rjwysocki.net

diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index 97f3d819852b2f51ccedf350f4abc273ea6ffd89..c24c168577f212f7ff7f76d2d2eb9b8acabc8680 100644 (file)
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -34,7 +34,7 @@ static void bang_bang_set_instance_target(struct thermal_instance *instance,
 }
 
 /**
- * bang_bang_control - controls devices associated with the given zone
+ * 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
@@ -61,9 +61,9 @@ static void bang_bang_set_instance_target(struct thermal_instance *instance,
  *     (trip_temp - hyst) so that the fan gets turned off again.
  *
  */
-static void bang_bang_control(struct thermal_zone_device *tz,
-                             const struct thermal_trip *trip,
-                             bool crossed_up)
+static void bang_bang_trip_crossed(struct thermal_zone_device *tz,
+                                  const struct thermal_trip *trip,
+                                  bool crossed_up)
 {
        const struct thermal_trip_desc *td = trip_to_trip_desc(trip);
        struct thermal_instance *instance;
@@ -123,7 +123,7 @@ static void bang_bang_update_tz(struct thermal_zone_device *tz,
 
 static struct thermal_governor thermal_gov_bang_bang = {
        .name           = "bang_bang",
-       .trip_crossed   = bang_bang_control,
+       .trip_crossed   = bang_bang_trip_crossed,
        .manage         = bang_bang_manage,
        .update_tz      = bang_bang_update_tz,
 };

diff --git a/drivers/thermal/gov_user_space.c b/drivers/thermal/gov_user_space.c
index 75137b419eb239b20033e9f913340aa8c05b0236..8a061a10162a6e4893164e590966ffb90b6888d1 100644 (file)
--- a/drivers/thermal/gov_user_space.c
+++ b/drivers/thermal/gov_user_space.c
@@ -23,16 +23,16 @@ static int user_space_bind(struct thermal_zone_device *tz)
 }
 
 /**
- * notify_user_space - Notifies user space about thermal events
+ * 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
  *
  * This function notifies the user space through UEvents.
  */
-static void notify_user_space(struct thermal_zone_device *tz,
-                             const struct thermal_trip *trip,
-                             bool crossed_up)
+static void user_space_trip_crossed(struct thermal_zone_device *tz,
+                                   const struct thermal_trip *trip,
+                                   bool crossed_up)
 {
        char *thermal_prop[5];
        int i;
@@ -52,7 +52,7 @@ static void notify_user_space(struct thermal_zone_device *tz,
 
 static struct thermal_governor thermal_gov_user_space = {
        .name           = "user_space",
-       .trip_crossed   = notify_user_space,
+       .trip_crossed   = user_space_trip_crossed,
        .bind_to_tz     = user_space_bind,
 };
 THERMAL_GOVERNOR_DECLARE(thermal_gov_user_space);