diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-08-15 15:49:30 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-08-15 15:49:30 +0800 |
| commit | f61d5b4d52e077756ce9dbc47ce737da898ad01d (patch) | |
| tree | 30634194545d031c1b8400e59c1a44ae9ca52555 /drivers/thermal | |
| parent | 036e8a13b8b047aeb553dd87acf2aca8edc7dfa8 (diff) | |
| parent | ca56caa02182044667b680154a0550ad52726584 (diff) | |
| download | linux-f61d5b4d52e077756ce9dbc47ce737da898ad01d.tar.bz2 | |
Merge branch 'fixes' of .git into next
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/step_wise.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index 4d4ddae1a991..d89e781b0a18 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -51,44 +51,51 @@ static unsigned long get_target_state(struct thermal_instance *instance, { struct thermal_cooling_device *cdev = instance->cdev; unsigned long cur_state; + unsigned long next_target; + /* + * We keep this instance the way it is by default. + * Otherwise, we use the current state of the + * cdev in use to determine the next_target. + */ cdev->ops->get_cur_state(cdev, &cur_state); + next_target = instance->target; switch (trend) { case THERMAL_TREND_RAISING: if (throttle) { - cur_state = cur_state < instance->upper ? + next_target = cur_state < instance->upper ? (cur_state + 1) : instance->upper; - if (cur_state < instance->lower) - cur_state = instance->lower; + if (next_target < instance->lower) + next_target = instance->lower; } break; case THERMAL_TREND_RAISE_FULL: if (throttle) - cur_state = instance->upper; + next_target = instance->upper; break; case THERMAL_TREND_DROPPING: if (cur_state == instance->lower) { if (!throttle) - cur_state = -1; + next_target = THERMAL_NO_TARGET; } else { - cur_state -= 1; - if (cur_state > instance->upper) - cur_state = instance->upper; + next_target = cur_state - 1; + if (next_target > instance->upper) + next_target = instance->upper; } break; case THERMAL_TREND_DROP_FULL: if (cur_state == instance->lower) { if (!throttle) - cur_state = -1; + next_target = THERMAL_NO_TARGET; } else - cur_state = instance->lower; + next_target = instance->lower; break; default: break; } - return cur_state; + return next_target; } static void update_passive_instance(struct thermal_zone_device *tz, @@ -133,6 +140,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) old_target = instance->target; instance->target = get_target_state(instance, trend, throttle); + if (old_target == instance->target) + continue; + /* Activate a passive thermal instance */ if (old_target == THERMAL_NO_TARGET && instance->target != THERMAL_NO_TARGET) |