On 27-11-15, 17:32, Dawei Chien wrote:
> MT8173 cpufreq driver use of_cpufreq_power_cooling_register registering
> cooling devices with dynamic power coefficient.
> 
> Signed-off-by: Dawei Chien <dawei.ch...@mediatek.com>
> ---
> This patch is base on patchset:
> https://lkml.org/lkml/2015/11/17/251
> ---
>  drivers/cpufreq/mt8173-cpufreq.c |   28 ++++++++++++++++++++--------
>  1 file changed, 20 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/cpufreq/mt8173-cpufreq.c 
> b/drivers/cpufreq/mt8173-cpufreq.c
> index 83001dc..4d39468 100644
> --- a/drivers/cpufreq/mt8173-cpufreq.c
> +++ b/drivers/cpufreq/mt8173-cpufreq.c
> @@ -263,24 +263,34 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy 
> *policy,
>       return 0;
>  }
>  
> +#define DYNAMIC_POWER "dynamic-power-coefficient"
> +
>  static void mtk_cpufreq_ready(struct cpufreq_policy *policy)
>  {
>       struct mtk_cpu_dvfs_info *info = policy->driver_data;
>       struct device_node *np = of_node_get(info->cpu_dev->of_node);
> +     u32 capacitance;
>  
>       if (WARN_ON(!np))
>               return;
>  
>       if (of_find_property(np, "#cooling-cells", NULL)) {
> -             info->cdev = of_cpufreq_cooling_register(np,
> -                                                      policy->related_cpus);
> +             if (!info->cdev) {

Why will info->cdev be non-NULL here ?

> +                     of_property_read_u32(np, DYNAMIC_POWER, &capacitance);

This can fail, in which case capacitance will be used uninitialized.
Fix that by initializing it with 0 at the beginning of this routine.

> +                     info->cdev = of_cpufreq_power_cooling_register(np,
> +                                                     policy->related_cpus,
> +                                                     capacitance,
> +                                                     NULL);
>  
> -             if (IS_ERR(info->cdev)) {
> -                     dev_err(info->cpu_dev,
> -                             "running cpufreq without cooling device: %ld\n",
> -                             PTR_ERR(info->cdev));
> +                     if (IS_ERR(info->cdev)) {
> +                             dev_err(info->cpu_dev,
> +                                     "running cpufreq without cooling 
> device: %ld\n",
> +                                     PTR_ERR(info->cdev));
>  
> -                     info->cdev = NULL;
> +                             info->cdev = NULL;
> +                     }
>               }
>       }
>  
> @@ -460,7 +470,9 @@ static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
>  {
>       struct mtk_cpu_dvfs_info *info = policy->driver_data;
>  
> -     cpufreq_cooling_unregister(info->cdev);
> +     if (info->cdev)
> +             cpufreq_cooling_unregister(info->cdev);
> +

Why do you need to update this?

>       dev_pm_opp_free_cpufreq_table(info->cpu_dev, &policy->freq_table);
>       mtk_cpu_dvfs_info_release(info);
>       kfree(info);
> -- 
> 1.7.9.5

-- 
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to