cpupfreq: tegra124: eliminate uses of of_node_put()

Make use of the __free() cleanup handler to automatically free nodes
when they get out of scope. Only the probe function is affected by this
modification.

Given that this mechanism requires the node to be initialized, its
initialization and the value check have been moved to the top of the
function.

After removing uses of of_node_put(), the jump to out_put_np is no
longer necessary.

Suggested-by: Julia Lawall <julia.lawall@inria.fr>
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/tegra124-cpufreq.c b/drivers/cpufreq/tegra124-cpufreq.c
index aae951d4e77cfd0136564f5f8e3ad60d1f694e3b..514146d98bca2d8aa59980a14dff3487cd8045f6 100644 (file)
--- a/drivers/cpufreq/tegra124-cpufreq.c
+++ b/drivers/cpufreq/tegra124-cpufreq.c
@@ -52,12 +52,15 @@ out:
 
 static int tegra124_cpufreq_probe(struct platform_device *pdev)
 {
+       struct device_node *np __free(device_node) = of_cpu_device_node_get(0);
        struct tegra124_cpufreq_priv *priv;
-       struct device_node *np;
        struct device *cpu_dev;
        struct platform_device_info cpufreq_dt_devinfo = {};
        int ret;
 
+       if (!np)
+               return -ENODEV;
+
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -66,15 +69,9 @@ static int tegra124_cpufreq_probe(struct platform_device *pdev)
        if (!cpu_dev)
                return -ENODEV;
 
-       np = of_cpu_device_node_get(0);
-       if (!np)
-               return -ENODEV;
-
        priv->cpu_clk = of_clk_get_by_name(np, "cpu_g");
-       if (IS_ERR(priv->cpu_clk)) {
-               ret = PTR_ERR(priv->cpu_clk);
-               goto out_put_np;
-       }
+       if (IS_ERR(priv->cpu_clk))
+               return PTR_ERR(priv->cpu_clk);
 
        priv->dfll_clk = of_clk_get_by_name(np, "dfll");
        if (IS_ERR(priv->dfll_clk)) {
@@ -110,8 +107,6 @@ static int tegra124_cpufreq_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, priv);
 
-       of_node_put(np);
-
        return 0;
 
 out_put_pllp_clk:
@@ -122,8 +117,6 @@ out_put_dfll_clk:
        clk_put(priv->dfll_clk);
 out_put_cpu_clk:
        clk_put(priv->cpu_clk);
-out_put_np:
-       of_node_put(np);
 
        return ret;
 }