public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Eduardo Valentin <edubezval@gmail.com>
To: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Rafael Wysocki <rjw@rjwysocki.net>,
	Javi Merino <javi.merino@kernel.org>,
	Zhang Rui <rui.zhang@intel.com>,
	Amit Daniel Kachhap <amit.kachhap@gmail.com>,
	linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Vincent Guittot <vincent.guittot@linaro.org>
Subject: Re: [PATCH 04/17] thermal: cpu_cooling: replace cool_dev with cdev
Date: Tue, 11 Apr 2017 10:35:13 -0700	[thread overview]
Message-ID: <20170411173510.GB5528@localhost.localdomain> (raw)
In-Reply-To: <7fd9ac075f06fb673c2e18b3c5aab9e41910ed12.1489640000.git.viresh.kumar@linaro.org>

[-- Attachment #1: Type: text/plain, Size: 5782 bytes --]

On Thu, Mar 16, 2017 at 10:59:39AM +0530, Viresh Kumar wrote:
> Objects of "struct thermal_cooling_device" are named a bit
> inconsistently. Lets use cdev everywhere.

In this case, cpufreq_cdev is best option on patch 3. Too bad we lost
the "cool" dev here :-)

> 
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
>  drivers/thermal/cpu_cooling.c | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
> index 7a19033d7f79..e2931c20c309 100644
> --- a/drivers/thermal/cpu_cooling.c
> +++ b/drivers/thermal/cpu_cooling.c
> @@ -65,7 +65,7 @@ struct power_table {
>   * struct cpufreq_cooling_device - data for cooling device with cpufreq
>   * @id: unique integer value corresponding to each cpufreq_cooling_device
>   *	registered.
> - * @cool_dev: thermal_cooling_device pointer to keep track of the
> + * @cdev: thermal_cooling_device pointer to keep track of the
>   *	registered cooling device.
>   * @cpufreq_state: integer value representing the current state of cpufreq
>   *	cooling	devices.
> @@ -90,7 +90,7 @@ struct power_table {
>   */
>  struct cpufreq_cooling_device {
>  	int id;
> -	struct thermal_cooling_device *cool_dev;
> +	struct thermal_cooling_device *cdev;
>  	unsigned int cpufreq_state;
>  	unsigned int clipped_freq;
>  	unsigned int max_level;
> @@ -243,7 +243,7 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_dev,
>  	for_each_cpu(cpu, &cpufreq_dev->allowed_cpus) {
>  		dev = get_cpu_device(cpu);
>  		if (!dev) {
> -			dev_warn(&cpufreq_dev->cool_dev->device,
> +			dev_warn(&cpufreq_dev->cdev->device,
>  				 "No cpu device for cpu %d\n", cpu);
>  			continue;
>  		}
> @@ -770,7 +770,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  			get_static_t plat_static_func)
>  {
>  	struct cpufreq_policy *policy;
> -	struct thermal_cooling_device *cool_dev;
> +	struct thermal_cooling_device *cdev;
>  	struct cpufreq_cooling_device *cpufreq_dev;
>  	char dev_name[THERMAL_NAME_LENGTH];
>  	struct cpufreq_frequency_table *pos, *table;
> @@ -786,20 +786,20 @@ __cpufreq_cooling_register(struct device_node *np,
>  	policy = cpufreq_cpu_get(cpumask_first(temp_mask));
>  	if (!policy) {
>  		pr_debug("%s: CPUFreq policy not found\n", __func__);
> -		cool_dev = ERR_PTR(-EPROBE_DEFER);
> +		cdev = ERR_PTR(-EPROBE_DEFER);
>  		goto free_cpumask;
>  	}
>  
>  	table = policy->freq_table;
>  	if (!table) {
>  		pr_debug("%s: CPUFreq table not found\n", __func__);
> -		cool_dev = ERR_PTR(-ENODEV);
> +		cdev = ERR_PTR(-ENODEV);
>  		goto put_policy;
>  	}
>  
>  	cpufreq_dev = kzalloc(sizeof(*cpufreq_dev), GFP_KERNEL);
>  	if (!cpufreq_dev) {
> -		cool_dev = ERR_PTR(-ENOMEM);
> +		cdev = ERR_PTR(-ENOMEM);
>  		goto put_policy;
>  	}
>  
> @@ -808,7 +808,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  					    sizeof(*cpufreq_dev->time_in_idle),
>  					    GFP_KERNEL);
>  	if (!cpufreq_dev->time_in_idle) {
> -		cool_dev = ERR_PTR(-ENOMEM);
> +		cdev = ERR_PTR(-ENOMEM);
>  		goto free_cdev;
>  	}
>  
> @@ -816,7 +816,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  		kcalloc(num_cpus, sizeof(*cpufreq_dev->time_in_idle_timestamp),
>  			GFP_KERNEL);
>  	if (!cpufreq_dev->time_in_idle_timestamp) {
> -		cool_dev = ERR_PTR(-ENOMEM);
> +		cdev = ERR_PTR(-ENOMEM);
>  		goto free_time_in_idle;
>  	}
>  
> @@ -827,7 +827,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  	cpufreq_dev->freq_table = kmalloc(sizeof(*cpufreq_dev->freq_table) *
>  					  cpufreq_dev->max_level, GFP_KERNEL);
>  	if (!cpufreq_dev->freq_table) {
> -		cool_dev = ERR_PTR(-ENOMEM);
> +		cdev = ERR_PTR(-ENOMEM);
>  		goto free_time_in_idle_timestamp;
>  	}
>  
> @@ -841,7 +841,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  
>  		ret = build_dyn_power_table(cpufreq_dev, capacitance);
>  		if (ret) {
> -			cool_dev = ERR_PTR(ret);
> +			cdev = ERR_PTR(ret);
>  			goto free_table;
>  		}
>  
> @@ -852,7 +852,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  
>  	ret = ida_simple_get(&cpufreq_ida, 0, 0, GFP_KERNEL);
>  	if (ret < 0) {
> -		cool_dev = ERR_PTR(ret);
> +		cdev = ERR_PTR(ret);
>  		goto free_power_table;
>  	}
>  	cpufreq_dev->id = ret;
> @@ -872,13 +872,13 @@ __cpufreq_cooling_register(struct device_node *np,
>  	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
>  		 cpufreq_dev->id);
>  
> -	cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
> -						      cooling_ops);
> -	if (IS_ERR(cool_dev))
> +	cdev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
> +						  cooling_ops);
> +	if (IS_ERR(cdev))
>  		goto remove_ida;
>  
>  	cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
> -	cpufreq_dev->cool_dev = cool_dev;
> +	cpufreq_dev->cdev = cdev;
>  
>  	mutex_lock(&cooling_list_lock);
>  	list_add(&cpufreq_dev->node, &cpufreq_dev_list);
> @@ -907,7 +907,7 @@ __cpufreq_cooling_register(struct device_node *np,
>  	cpufreq_cpu_put(policy);
>  free_cpumask:
>  	free_cpumask_var(temp_mask);
> -	return cool_dev;
> +	return cdev;
>  }
>  
>  /**
> @@ -1043,7 +1043,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
>  	list_del(&cpufreq_dev->node);
>  	mutex_unlock(&cooling_list_lock);
>  
> -	thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
> +	thermal_cooling_device_unregister(cpufreq_dev->cdev);
>  	ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
>  	kfree(cpufreq_dev->dyn_power_table);
>  	kfree(cpufreq_dev->time_in_idle_timestamp);
> -- 
> 2.7.1.410.g6faf27b
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  reply	other threads:[~2017-04-11 17:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-16  5:26 [PATCH 00/17] thermal: cpu_cooling: improve interaction with cpufreq core Viresh Kumar
2017-03-16  5:29 ` [PATCH 01/17] thermal: cpu_cooling: Avoid accessing potentially freed structures Viresh Kumar
2017-03-16  5:29 ` [PATCH 02/17] thermal: cpu_cooling: rearrange globals Viresh Kumar
2017-03-16  5:29 ` [PATCH 03/17] thermal: cpu_cooling: Replace cpufreq_device with cpufreq_dev Viresh Kumar
2017-04-11 17:33   ` Eduardo Valentin
2017-04-12  6:16     ` Viresh Kumar
2017-03-16  5:29 ` [PATCH 04/17] thermal: cpu_cooling: replace cool_dev with cdev Viresh Kumar
2017-04-11 17:35   ` Eduardo Valentin [this message]
2017-03-16  5:29 ` [PATCH 05/17] thermal: cpu_cooling: remove cpufreq_cooling_get_level() Viresh Kumar
2017-04-11 17:43   ` Eduardo Valentin
2017-04-12  6:25     ` Viresh Kumar
2017-03-16  5:29 ` [PATCH 06/17] thermal: cpu_cooling: get rid of a variable in cpufreq_set_cur_state() Viresh Kumar
2017-03-16  5:29 ` [PATCH 07/17] thermal: cpu_cooling: use cpufreq_policy to register cooling device Viresh Kumar
2017-03-16  5:29 ` [PATCH 08/17] cpufreq: create cpufreq_table_count_valid_entries() Viresh Kumar
2017-03-16  5:29 ` [PATCH 09/17] thermal: cpu_cooling: store cpufreq policy Viresh Kumar
2017-03-16  5:29 ` [PATCH 10/17] thermal: cpu_cooling: OPPs are registered for all CPUs Viresh Kumar
2017-03-16  5:29 ` [PATCH 11/17] thermal: cpu_cooling: get rid of 'allowed_cpus' Viresh Kumar
2017-03-16  5:29 ` [PATCH 12/17] thermal: cpu_cooling: merge frequency and power tables Viresh Kumar
2017-03-16  5:29 ` [PATCH 13/17] thermal: cpu_cooling: create structure for idle time stats Viresh Kumar
2017-03-16  5:29 ` [PATCH 14/17] thermal: cpu_cooling: get_level() can't fail Viresh Kumar
2017-03-16  5:29 ` [PATCH 15/17] thermal: cpu_cooling: don't store cpu_dev in cpufreq_dev Viresh Kumar
2017-03-16  5:29 ` [PATCH 16/17] thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power() Viresh Kumar
2017-03-16  5:29 ` [PATCH 17/17] thermal: cpu_cooling: Rearrange struct cpufreq_cooling_device Viresh Kumar
2017-04-11  6:02 ` [PATCH 00/17] thermal: cpu_cooling: improve interaction with cpufreq core Viresh Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170411173510.GB5528@localhost.localdomain \
    --to=edubezval@gmail.com \
    --cc=amit.kachhap@gmail.com \
    --cc=javi.merino@kernel.org \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=rui.zhang@intel.com \
    --cc=vincent.guittot@linaro.org \
    --cc=viresh.kumar@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox