Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[firefly-linux-kernel-4.4.55.git] / drivers / thermal / step_wise.c

diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c
index 3f9cfcf66ccdfd743066cc87a71b012d4a6d36ad..0cd5e9fbab1c96ea7393db980aeafc26c87bb577 100644 (file)
--- a/drivers/thermal/step_wise.c
+++ b/drivers/thermal/step_wise.c
@@ -150,7 +150,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
  * step. If the zone is 'cooling down' it brings back the performance of
  * the devices by one step.
  */
-int step_wise_throttle(struct thermal_zone_device *tz, int trip)
+static int step_wise_throttle(struct thermal_zone_device *tz, int trip)
 {
        struct thermal_instance *instance;
 
@@ -169,8 +169,8 @@ int step_wise_throttle(struct thermal_zone_device *tz, int trip)
        return 0;
 }
 
-struct thermal_governor thermal_gov_step_wise = {
-       .name           = DEFAULT_THERMAL_GOVERNOR,
+static struct thermal_governor thermal_gov_step_wise = {
+       .name           = "step_wise",
        .throttle       = step_wise_throttle,
        .owner          = THIS_MODULE,
 };