diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-02-05 08:44:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-02-05 08:44:22 +0100 |
| commit | fdff7c21ea00787e3f70a1a00b40b88eb998c6ad (patch) | |
| tree | 03016a8375e849e2c39dec8a15d660055bb16a8c /drivers/thermal/devfreq_cooling.c | |
| parent | f1ec3a517b4352e78dbef6b1e591f43202ecb3fe (diff) | |
| parent | b3a6082223369203d7e7db7e81253ac761377644 (diff) | |
Merge branch 'linus' into perf/urgent, to synchronize with upstream
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/thermal/devfreq_cooling.c')
| -rw-r--r-- | drivers/thermal/devfreq_cooling.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index ef59256887ff..a87d4fa031c8 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -53,6 +53,7 @@ static DEFINE_IDA(devfreq_ida); * 'utilization' (which is 'busy_time / 'total_time'). * The 'res_util' range is from 100 to (power_table[state] * 100) * for the corresponding 'state'. + * @capped_state: index to cooling state with in dynamic power budget */ struct devfreq_cooling_device { int id; @@ -587,7 +588,7 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_register); /** * devfreq_cooling_unregister() - Unregister devfreq cooling device. - * @dfc: Pointer to devfreq cooling device to unregister. + * @cdev: Pointer to devfreq cooling device to unregister. */ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) { |