lkml.org 
[lkml]   [2017]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 16/17] thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power()
    Date
    The frequency table shouldn't have any zero frequency entries and so
    such a check isn't required. Though it would be better to make sure
    'state' is within limits.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    drivers/thermal/cpu_cooling.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
    index 1e4c5d13afbf..dfc3638ea939 100644
    --- a/drivers/thermal/cpu_cooling.c
    +++ b/drivers/thermal/cpu_cooling.c
    @@ -560,12 +560,13 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev,
    int ret;
    struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;

    + /* Request state should be less than max_level */
    + if (WARN_ON(state > cpufreq_cdev->max_level))
    + return -EINVAL;
    +
    num_cpus = cpumask_weight(cpufreq_cdev->policy->cpus);

    freq = cpufreq_cdev->freq_table[state].frequency;
    - if (!freq)
    - return -EINVAL;
    -
    dynamic_power = cpu_freq_to_power(cpufreq_cdev, freq) * num_cpus;
    ret = get_static_power(cpufreq_cdev, tz, freq, &static_power);
    if (ret)
    --
    2.12.0.432.g71c3a4f4ba37
    \
     
     \ /
      Last update: 2017-04-17 08:04    [W:4.368 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site