cpufreq: sun50i: replace of_node_put() with automatic cleanup handler

Make use of the __free() cleanup handler to automatically free nodes
when they get out of scope.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
index ef83e4bf263911a4775143d6728145d343f9feac..eb47c193269cb77bfaa1a911180adeef4996d551 100644 (file)
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
@@ -131,14 +131,14 @@ static const struct of_device_id cpu_opp_match_list[] = {
 static bool dt_has_supported_hw(void)
 {
        bool has_opp_supported_hw = false;
-       struct device_node *np;
        struct device *cpu_dev;
 
        cpu_dev = get_cpu_device(0);
        if (!cpu_dev)
                return false;
 
-       np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
+       struct device_node *np __free(device_node) =
+               dev_pm_opp_of_get_opp_desc_node(cpu_dev);
        if (!np)
                return false;
 
@@ -149,8 +149,6 @@ static bool dt_has_supported_hw(void)
                }
        }
 
-       of_node_put(np);
-
        return has_opp_supported_hw;
 }
 
@@ -165,7 +163,6 @@ static int sun50i_cpufreq_get_efuse(void)
        const struct sunxi_cpufreq_data *opp_data;
        struct nvmem_cell *speedbin_nvmem;
        const struct of_device_id *match;
-       struct device_node *np;
        struct device *cpu_dev;
        u32 *speedbin;
        int ret;
@@ -174,19 +171,18 @@ static int sun50i_cpufreq_get_efuse(void)
        if (!cpu_dev)
                return -ENODEV;
 
-       np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
+       struct device_node *np __free(device_node) =
+               dev_pm_opp_of_get_opp_desc_node(cpu_dev);
        if (!np)
                return -ENOENT;
 
        match = of_match_node(cpu_opp_match_list, np);
-       if (!match) {
-               of_node_put(np);
+       if (!match)
                return -ENOENT;
-       }
+
        opp_data = match->data;
 
        speedbin_nvmem = of_nvmem_cell_get(np, NULL);
-       of_node_put(np);
        if (IS_ERR(speedbin_nvmem))
                return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),
                                     "Could not get nvmem cell\n");
@@ -301,14 +297,9 @@ MODULE_DEVICE_TABLE(of, sun50i_cpufreq_match_list);
 
 static const struct of_device_id *sun50i_cpufreq_match_node(void)
 {
-       const struct of_device_id *match;
-       struct device_node *np;
-
-       np = of_find_node_by_path("/");
-       match = of_match_node(sun50i_cpufreq_match_list, np);
-       of_node_put(np);
+       struct device_node *np __free(device_node) = of_find_node_by_path("/");
 
-       return match;
+       return of_match_node(sun50i_cpufreq_match_list, np);
 }
 
 /*