projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cpufreq: cpufreq-dt: avoid uninitialized variable warnings:
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cpufreq
/
cpufreq-dt.c
diff --git
a/drivers/cpufreq/cpufreq-dt.c
b/drivers/cpufreq/cpufreq-dt.c
index 90d64081ddb34ee8ba7a06372a269defdcf07a97..68232fef54c960bd1a9f75005327729b720af8c6 100644
(file)
--- a/
drivers/cpufreq/cpufreq-dt.c
+++ b/
drivers/cpufreq/cpufreq-dt.c
@@
-141,15
+141,16
@@
static int allocate_resources(int cpu, struct device **cdev,
try_again:
cpu_reg = regulator_get_optional(cpu_dev, reg);
try_again:
cpu_reg = regulator_get_optional(cpu_dev, reg);
- if (IS_ERR(cpu_reg)) {
+ ret = PTR_ERR_OR_ZERO(cpu_reg);
+ if (ret) {
/*
* If cpu's regulator supply node is present, but regulator is
* not yet registered, we should try defering probe.
*/
/*
* If cpu's regulator supply node is present, but regulator is
* not yet registered, we should try defering probe.
*/
- if (
PTR_ERR(cpu_reg)
== -EPROBE_DEFER) {
+ if (
ret
== -EPROBE_DEFER) {
dev_dbg(cpu_dev, "cpu%d regulator not ready, retry\n",
cpu);
dev_dbg(cpu_dev, "cpu%d regulator not ready, retry\n",
cpu);
- return
-EPROBE_DEFER
;
+ return
ret
;
}
/* Try with "cpu-supply" */
}
/* Try with "cpu-supply" */
@@
-158,18
+159,16
@@
try_again:
goto try_again;
}
goto try_again;
}
- dev_dbg(cpu_dev, "no regulator for cpu%d: %ld\n",
- cpu, PTR_ERR(cpu_reg));
+ dev_dbg(cpu_dev, "no regulator for cpu%d: %d\n", cpu, ret);
}
cpu_clk = clk_get(cpu_dev, NULL);
}
cpu_clk = clk_get(cpu_dev, NULL);
- if (IS_ERR(cpu_clk)) {
+ ret = PTR_ERR_OR_ZERO(cpu_clk);
+ if (ret) {
/* put regulator */
if (!IS_ERR(cpu_reg))
regulator_put(cpu_reg);
/* put regulator */
if (!IS_ERR(cpu_reg))
regulator_put(cpu_reg);
- ret = PTR_ERR(cpu_clk);
-
/*
* If cpu's clk node is present, but clock is not yet
* registered, we should try defering probe.
/*
* If cpu's clk node is present, but clock is not yet
* registered, we should try defering probe.