Re: [PATCH V4 03/17] thermal: cpu_cooling: Name cpufreq cooling devices as cpufreq_cdev

[Zhang Rui]

On Tue, 2017-04-25 at 15:57 +0530, Viresh Kumar wrote:
> Objects of "struct cpufreq_cooling_device" are named a bit
> inconsistently. Lets use cpufreq_cdev everywhere. Also note that the
> lists containing such devices is renamed similarly too.
> 
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> Tested-by: Lukasz Luba <lukasz.luba@xxxxxxx>
> ---
> Âdrivers/thermal/cpu_cooling.c | 248 +++++++++++++++++++++-----------
> ----------
> Â1 file changed, 124 insertions(+), 124 deletions(-)
> 
> 

> Â
> Â	num_cpus = cpumask_weight(clip_cpus);
> -	cpufreq_dev->time_in_idle = kcalloc(num_cpus,
> -					ÂÂÂÂsizeof(*cpufreq_dev-
> >time_in_idle),
> +	cpufreq_cdev->time_in_idle = kcalloc(num_cpus,
> +					ÂÂÂÂsizeof(*cpufreq_cdev-
> >time_in_idle),
> Â					ÂÂÂÂGFP_KERNEL);

checkpatch complains about this line

WARNING: Prefer kmalloc_array over kmalloc with multiply
#544: FILE: drivers/thermal/cpu_cooling.c:827:
+	cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev-
>freq_table) *
+					ÂÂcpufreq_cdev->max_level,
GFP_KERNEL);

total: 0 errors, 1 warnings, 614 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
ÂÂÂÂÂÂmechanically convert to the typical style using --fix or --fix-
inplace.

and also patch 8/17.

It's better to get this fixed.

thanks,
rui


> -	if (!cpufreq_dev->time_in_idle) {
> +	if (!cpufreq_cdev->time_in_idle) {
> Â		cool_dev = ERR_PTR(-ENOMEM);
> Â		goto free_cdev;
> Â	}
> Â
> -	cpufreq_dev->time_in_idle_timestamp =
> -		kcalloc(num_cpus, sizeof(*cpufreq_dev-
> >time_in_idle_timestamp),
> +	cpufreq_cdev->time_in_idle_timestamp =
> +		kcalloc(num_cpus, sizeof(*cpufreq_cdev-
> >time_in_idle_timestamp),
> Â			GFP_KERNEL);
> -	if (!cpufreq_dev->time_in_idle_timestamp) {
> +	if (!cpufreq_cdev->time_in_idle_timestamp) {
> Â		cool_dev = ERR_PTR(-ENOMEM);
> Â		goto free_time_in_idle;
> Â	}
> Â
> Â	/* Find max levels */
> Â	cpufreq_for_each_valid_entry(pos, table)
> -		cpufreq_dev->max_level++;
> +		cpufreq_cdev->max_level++;
> Â
> -	cpufreq_dev->freq_table = kmalloc(sizeof(*cpufreq_dev-
> >freq_table) *
> -					ÂÂcpufreq_dev->max_level,
> GFP_KERNEL);
> -	if (!cpufreq_dev->freq_table) {
> +	cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev-
> >freq_table) *
> +					ÂÂcpufreq_cdev->max_level,
> GFP_KERNEL);
> +	if (!cpufreq_cdev->freq_table) {
> Â		cool_dev = ERR_PTR(-ENOMEM);
> Â		goto free_time_in_idle_timestamp;
> Â	}
> Â
> Â	/* max_level is an index, not a counter */
> -	cpufreq_dev->max_level--;
> +	cpufreq_cdev->max_level--;
> Â
> -	cpumask_copy(&cpufreq_dev->allowed_cpus, clip_cpus);
> +	cpumask_copy(&cpufreq_cdev->allowed_cpus, clip_cpus);
> Â
> Â	if (capacitance) {
> -		cpufreq_dev->plat_get_static_power =
> plat_static_func;
> +		cpufreq_cdev->plat_get_static_power =
> plat_static_func;
> Â
> -		ret = build_dyn_power_table(cpufreq_dev,
> capacitance);
> +		ret = build_dyn_power_table(cpufreq_cdev,
> capacitance);
> Â		if (ret) {
> Â			cool_dev = ERR_PTR(ret);
> Â			goto free_table;
> @@ -856,12 +855,12 @@ __cpufreq_cooling_register(struct device_node
> *np,
> Â		cool_dev = ERR_PTR(ret);
> Â		goto free_power_table;
> Â	}
> -	cpufreq_dev->id = ret;
> +	cpufreq_cdev->id = ret;
> Â
> Â	/* Fill freq-table in descending order of frequencies */
> -	for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {
> +	for (i = 0, freq = -1; i <= cpufreq_cdev->max_level; i++) {
> Â		freq = find_next_max(table, freq);
> -		cpufreq_dev->freq_table[i] = freq;
> +		cpufreq_cdev->freq_table[i] = freq;
> Â
> Â		/* Warn for duplicate entries */
> Â		if (!freq)
> @@ -871,20 +870,21 @@ __cpufreq_cooling_register(struct device_node
> *np,
> Â	}
> Â
> Â	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
> -		Âcpufreq_dev->id);
> +		Âcpufreq_cdev->id);
> Â
> -	cool_dev = thermal_of_cooling_device_register(np, dev_name,
> cpufreq_dev,
> +	cool_dev = thermal_of_cooling_device_register(np, dev_name,
> +						ÂÂÂÂÂÂcpufreq_cdev,
> Â						ÂÂÂÂÂÂcooling_ops);
> Â	if (IS_ERR(cool_dev))
> Â		goto remove_ida;
> Â
> -	cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
> -	cpufreq_dev->cool_dev = cool_dev;
> +	cpufreq_cdev->clipped_freq = cpufreq_cdev->freq_table[0];
> +	cpufreq_cdev->cool_dev = cool_dev;
> Â
> Â	mutex_lock(&cooling_list_lock);
> Â	/* Register the notifier for first cpufreq cooling device */
> -	first = list_empty(&cpufreq_dev_list);
> -	list_add(&cpufreq_dev->node, &cpufreq_dev_list);
> +	first = list_empty(&cpufreq_cdev_list);
> +	list_add(&cpufreq_cdev->node, &cpufreq_cdev_list);
> Â	mutex_unlock(&cooling_list_lock);
> Â
> Â	if (first)
> @@ -894,17 +894,17 @@ __cpufreq_cooling_register(struct device_node
> *np,
> Â	goto put_policy;
> Â
> Âremove_ida:
> -	ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
> +	ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id);
> Âfree_power_table:
> -	kfree(cpufreq_dev->dyn_power_table);
> +	kfree(cpufreq_cdev->dyn_power_table);
> Âfree_table:
> -	kfree(cpufreq_dev->freq_table);
> +	kfree(cpufreq_cdev->freq_table);
> Âfree_time_in_idle_timestamp:
> -	kfree(cpufreq_dev->time_in_idle_timestamp);
> +	kfree(cpufreq_cdev->time_in_idle_timestamp);
> Âfree_time_in_idle:
> -	kfree(cpufreq_dev->time_in_idle);
> +	kfree(cpufreq_cdev->time_in_idle);
> Âfree_cdev:
> -	kfree(cpufreq_dev);
> +	kfree(cpufreq_cdev);
> Âput_policy:
> Â	cpufreq_cpu_put(policy);
> Âfree_cpumask:
> @@ -1029,30 +1029,30 @@
> EXPORT_SYMBOL(of_cpufreq_power_cooling_register);
> Â */
> Âvoid cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
> Â{
> -	struct cpufreq_cooling_device *cpufreq_dev;
> +	struct cpufreq_cooling_device *cpufreq_cdev;
> Â	bool last;
> Â
> Â	if (!cdev)
> Â		return;
> Â
> -	cpufreq_dev = cdev->devdata;
> +	cpufreq_cdev = cdev->devdata;
> Â
> Â	mutex_lock(&cooling_list_lock);
> -	list_del(&cpufreq_dev->node);
> +	list_del(&cpufreq_cdev->node);
> Â	/* Unregister the notifier for the last cpufreq cooling
> device */
> -	last = list_empty(&cpufreq_dev_list);
> +	last = list_empty(&cpufreq_cdev_list);
> Â	mutex_unlock(&cooling_list_lock);
> Â
> Â	if (last)
> Â		cpufreq_unregister_notifier(&thermal_cpufreq_notifie
> r_block,
> Â					ÂÂÂÂCPUFREQ_POLICY_NOTIFIER)
> ;
> Â
> -	thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
> -	ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
> -	kfree(cpufreq_dev->dyn_power_table);
> -	kfree(cpufreq_dev->time_in_idle_timestamp);
> -	kfree(cpufreq_dev->time_in_idle);
> -	kfree(cpufreq_dev->freq_table);
> -	kfree(cpufreq_dev);
> +	thermal_cooling_device_unregister(cpufreq_cdev->cool_dev);
> +	ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id);
> +	kfree(cpufreq_cdev->dyn_power_table);
> +	kfree(cpufreq_cdev->time_in_idle_timestamp);
> +	kfree(cpufreq_cdev->time_in_idle);
> +	kfree(cpufreq_cdev->freq_table);
> +	kfree(cpufreq_cdev);
> Â}
> ÂEXPORT_SYMBOL_GPL(cpufreq_cooling_unregister);