Commit 68090fda authored by Javier Carrasco's avatar Javier Carrasco Committed by Viresh Kumar

cpufreq: dt: eliminate uses of of_node_put()

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

Only find_supply_name() is affected, and the new mechanism removes the
need for a 'goto' and the 'name' local variable.
Signed-off-by: default avatarJavier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d769eaef
...@@ -68,12 +68,9 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index) ...@@ -68,12 +68,9 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index)
*/ */
static const char *find_supply_name(struct device *dev) static const char *find_supply_name(struct device *dev)
{ {
struct device_node *np; struct device_node *np __free(device_node) = of_node_get(dev->of_node);
struct property *pp; struct property *pp;
int cpu = dev->id; int cpu = dev->id;
const char *name = NULL;
np = of_node_get(dev->of_node);
/* This must be valid for sure */ /* This must be valid for sure */
if (WARN_ON(!np)) if (WARN_ON(!np))
...@@ -82,22 +79,16 @@ static const char *find_supply_name(struct device *dev) ...@@ -82,22 +79,16 @@ static const char *find_supply_name(struct device *dev)
/* Try "cpu0" for older DTs */ /* Try "cpu0" for older DTs */
if (!cpu) { if (!cpu) {
pp = of_find_property(np, "cpu0-supply", NULL); pp = of_find_property(np, "cpu0-supply", NULL);
if (pp) { if (pp)
name = "cpu0"; return "cpu0";
goto node_put;
}
} }
pp = of_find_property(np, "cpu-supply", NULL); pp = of_find_property(np, "cpu-supply", NULL);
if (pp) { if (pp)
name = "cpu"; return "cpu";
goto node_put;
}
dev_dbg(dev, "no regulator for cpu%d\n", cpu); dev_dbg(dev, "no regulator for cpu%d\n", cpu);
node_put: return NULL;
of_node_put(np);
return name;
} }
static int cpufreq_init(struct cpufreq_policy *policy) static int cpufreq_init(struct cpufreq_policy *policy)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment