use of_node_put() to release the refcount.
Signed-off-by: Yangtao Li <[email protected]>
---
drivers/cpufreq/powernv-cpufreq.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index bf6519cf64bc..7e7ad3879c4e 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -253,18 +253,18 @@ static int init_powernv_pstates(void)
if (of_property_read_u32(power_mgt, "ibm,pstate-min", &pstate_min)) {
pr_warn("ibm,pstate-min node not found\n");
- return -ENODEV;
+ goto out;
}
if (of_property_read_u32(power_mgt, "ibm,pstate-max", &pstate_max)) {
pr_warn("ibm,pstate-max node not found\n");
- return -ENODEV;
+ goto out;
}
if (of_property_read_u32(power_mgt, "ibm,pstate-nominal",
&pstate_nominal)) {
pr_warn("ibm,pstate-nominal not found\n");
- return -ENODEV;
+ goto out;
}
if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",
@@ -293,14 +293,14 @@ static int init_powernv_pstates(void)
pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids);
if (!pstate_ids) {
pr_warn("ibm,pstate-ids not found\n");
- return -ENODEV;
+ goto out;
}
pstate_freqs = of_get_property(power_mgt, "ibm,pstate-frequencies-mhz",
&len_freqs);
if (!pstate_freqs) {
pr_warn("ibm,pstate-frequencies-mhz not found\n");
- return -ENODEV;
+ goto out;
}
if (len_ids != len_freqs) {
@@ -311,7 +311,7 @@ static int init_powernv_pstates(void)
nr_pstates = min(len_ids, len_freqs) / sizeof(u32);
if (!nr_pstates) {
pr_warn("No PStates found\n");
- return -ENODEV;
+ goto out;
}
powernv_pstate_info.nr_pstates = nr_pstates;
@@ -352,7 +352,12 @@ static int init_powernv_pstates(void)
/* End of list marker entry */
powernv_freqs[i].frequency = CPUFREQ_TABLE_END;
+
+ of_node_put(power_mgt);
return 0;
+out:
+ of_node_put(power_mgt);
+ return -ENODEV;
}
/* Returns the CPU frequency corresponding to the pstate_id. */
--
2.17.0
On Tue, Nov 20, 2018 at 1:57 PM Yangtao Li <[email protected]> wrote:
>
> use of_node_put() to release the refcount.
Again, this changelog is as good as no changelog at all.
If you are adding a missing of_node_put(), please say that and explain
why it is necessary.
Thanks,
Rafael
Hello Yangtao Li,
On Tue, Nov 20, 2018 at 07:57:31AM -0500, Yangtao Li wrote:
> use of_node_put() to release the refcount.
>
Thanks for the patch.
Reviewed-by: Gautham R. Shenoy <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> drivers/cpufreq/powernv-cpufreq.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
> index bf6519cf64bc..7e7ad3879c4e 100644
> --- a/drivers/cpufreq/powernv-cpufreq.c
> +++ b/drivers/cpufreq/powernv-cpufreq.c
> @@ -253,18 +253,18 @@ static int init_powernv_pstates(void)
>
> if (of_property_read_u32(power_mgt, "ibm,pstate-min", &pstate_min)) {
> pr_warn("ibm,pstate-min node not found\n");
> - return -ENODEV;
> + goto out;
> }
>
> if (of_property_read_u32(power_mgt, "ibm,pstate-max", &pstate_max)) {
> pr_warn("ibm,pstate-max node not found\n");
> - return -ENODEV;
> + goto out;
> }
>
> if (of_property_read_u32(power_mgt, "ibm,pstate-nominal",
> &pstate_nominal)) {
> pr_warn("ibm,pstate-nominal not found\n");
> - return -ENODEV;
> + goto out;
> }
>
> if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",
> @@ -293,14 +293,14 @@ static int init_powernv_pstates(void)
> pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids);
> if (!pstate_ids) {
> pr_warn("ibm,pstate-ids not found\n");
> - return -ENODEV;
> + goto out;
> }
>
> pstate_freqs = of_get_property(power_mgt, "ibm,pstate-frequencies-mhz",
> &len_freqs);
> if (!pstate_freqs) {
> pr_warn("ibm,pstate-frequencies-mhz not found\n");
> - return -ENODEV;
> + goto out;
> }
>
> if (len_ids != len_freqs) {
> @@ -311,7 +311,7 @@ static int init_powernv_pstates(void)
> nr_pstates = min(len_ids, len_freqs) / sizeof(u32);
> if (!nr_pstates) {
> pr_warn("No PStates found\n");
> - return -ENODEV;
> + goto out;
> }
>
> powernv_pstate_info.nr_pstates = nr_pstates;
> @@ -352,7 +352,12 @@ static int init_powernv_pstates(void)
>
> /* End of list marker entry */
> powernv_freqs[i].frequency = CPUFREQ_TABLE_END;
> +
> + of_node_put(power_mgt);
> return 0;
> +out:
> + of_node_put(power_mgt);
> + return -ENODEV;
> }
>
> /* Returns the CPU frequency corresponding to the pstate_id. */
> --
> 2.17.0
>