* [PATCH V3] thermal: imx: Add missing of_node_put()
@ 2020-04-29 2:49 Anson Huang
2020-05-24 3:26 ` Anson Huang
0 siblings, 1 reply; 3+ messages in thread
From: Anson Huang @ 2020-04-29 2:49 UTC (permalink / raw)
To: rui.zhang, daniel.lezcano, amit.kucheria, shawnguo, s.hauer,
kernel, festevam, linux-pm, linux-arm-kernel, linux-kernel
Cc: Linux-imx
After finishing using cpu node got from of_get_cpu_node(), of_node_put()
needs to be called, the cpufreq policy also needs to be put unconditionally.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
Changes since V2:
- call cpufreq_cpu_put() unconditionally after cooling register done.
---
drivers/thermal/imx_thermal.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index e761c9b..8764cb5 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -649,7 +649,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);
static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
{
struct device_node *np;
- int ret;
+ int ret = 0;
data->policy = cpufreq_cpu_get(0);
if (!data->policy) {
@@ -661,20 +661,19 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
if (!np || !of_find_property(np, "#cooling-cells", NULL)) {
data->cdev = cpufreq_cooling_register(data->policy);
- if (IS_ERR(data->cdev)) {
+ if (IS_ERR(data->cdev))
ret = PTR_ERR(data->cdev);
- cpufreq_cpu_put(data->policy);
- return ret;
- }
}
- return 0;
+ cpufreq_cpu_put(data->policy);
+ of_node_put(np);
+
+ return ret;
}
static void imx_thermal_unregister_legacy_cooling(struct imx_thermal_data *data)
{
cpufreq_cooling_unregister(data->cdev);
- cpufreq_cpu_put(data->policy);
}
#else
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH V3] thermal: imx: Add missing of_node_put()
2020-04-29 2:49 [PATCH V3] thermal: imx: Add missing of_node_put() Anson Huang
@ 2020-05-24 3:26 ` Anson Huang
2020-05-24 5:05 ` Daniel Lezcano
0 siblings, 1 reply; 3+ messages in thread
From: Anson Huang @ 2020-05-24 3:26 UTC (permalink / raw)
To: Anson Huang, rui.zhang, daniel.lezcano, amit.kucheria, shawnguo,
s.hauer, kernel, festevam, linux-pm, linux-arm-kernel,
linux-kernel
Cc: dl-linux-imx
Gentle ping...
> Subject: [PATCH V3] thermal: imx: Add missing of_node_put()
>
> After finishing using cpu node got from of_get_cpu_node(), of_node_put()
> needs to be called, the cpufreq policy also needs to be put unconditionally.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> Changes since V2:
> - call cpufreq_cpu_put() unconditionally after cooling register done.
> ---
> drivers/thermal/imx_thermal.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
> index e761c9b..8764cb5 100644
> --- a/drivers/thermal/imx_thermal.c
> +++ b/drivers/thermal/imx_thermal.c
> @@ -649,7 +649,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);
> static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
> {
> struct device_node *np;
> - int ret;
> + int ret = 0;
>
> data->policy = cpufreq_cpu_get(0);
> if (!data->policy) {
> @@ -661,20 +661,19 @@ static int
> imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
>
> if (!np || !of_find_property(np, "#cooling-cells", NULL)) {
> data->cdev = cpufreq_cooling_register(data->policy);
> - if (IS_ERR(data->cdev)) {
> + if (IS_ERR(data->cdev))
> ret = PTR_ERR(data->cdev);
> - cpufreq_cpu_put(data->policy);
> - return ret;
> - }
> }
>
> - return 0;
> + cpufreq_cpu_put(data->policy);
> + of_node_put(np);
> +
> + return ret;
> }
>
> static void imx_thermal_unregister_legacy_cooling(struct imx_thermal_data
> *data) {
> cpufreq_cooling_unregister(data->cdev);
> - cpufreq_cpu_put(data->policy);
> }
>
> #else
> --
> 2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V3] thermal: imx: Add missing of_node_put()
2020-05-24 3:26 ` Anson Huang
@ 2020-05-24 5:05 ` Daniel Lezcano
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Lezcano @ 2020-05-24 5:05 UTC (permalink / raw)
To: Anson Huang, rui.zhang, amit.kucheria, shawnguo, s.hauer, kernel,
festevam, linux-pm, linux-arm-kernel, linux-kernel
Cc: dl-linux-imx
On 24/05/2020 05:26, Anson Huang wrote:
> Gentle ping...
It is applied, sorry for not letting you know.
>> Subject: [PATCH V3] thermal: imx: Add missing of_node_put()
>>
>> After finishing using cpu node got from of_get_cpu_node(), of_node_put()
>> needs to be called, the cpufreq policy also needs to be put unconditionally.
>>
>> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
>> ---
>> Changes since V2:
>> - call cpufreq_cpu_put() unconditionally after cooling register done.
>> ---
>> drivers/thermal/imx_thermal.c | 13 ++++++-------
>> 1 file changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
>> index e761c9b..8764cb5 100644
>> --- a/drivers/thermal/imx_thermal.c
>> +++ b/drivers/thermal/imx_thermal.c
>> @@ -649,7 +649,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);
>> static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
>> {
>> struct device_node *np;
>> - int ret;
>> + int ret = 0;
>>
>> data->policy = cpufreq_cpu_get(0);
>> if (!data->policy) {
>> @@ -661,20 +661,19 @@ static int
>> imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
>>
>> if (!np || !of_find_property(np, "#cooling-cells", NULL)) {
>> data->cdev = cpufreq_cooling_register(data->policy);
>> - if (IS_ERR(data->cdev)) {
>> + if (IS_ERR(data->cdev))
>> ret = PTR_ERR(data->cdev);
>> - cpufreq_cpu_put(data->policy);
>> - return ret;
>> - }
>> }
>>
>> - return 0;
>> + cpufreq_cpu_put(data->policy);
>> + of_node_put(np);
>> +
>> + return ret;
>> }
>>
>> static void imx_thermal_unregister_legacy_cooling(struct imx_thermal_data
>> *data) {
>> cpufreq_cooling_unregister(data->cdev);
>> - cpufreq_cpu_put(data->policy);
>> }
>>
>> #else
>> --
>> 2.7.4
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-24 5:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-29 2:49 [PATCH V3] thermal: imx: Add missing of_node_put() Anson Huang
2020-05-24 3:26 ` Anson Huang
2020-05-24 5:05 ` Daniel Lezcano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).