'dev_opp' will always be NULL in _of_init_opp_table_v2() after creating OPPs for a device. There is no point comparing it against NULL there.
Restructure code a bit to make it more efficient.
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org --- drivers/base/power/opp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 1daaa1a418a2..c9747fb192b1 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -1295,20 +1295,19 @@ static int _of_init_opp_table_v2(struct device *dev, if (WARN_ON(!count)) goto out;
- if (!ret) { - if (!dev_opp) { - dev_opp = _find_device_opp(dev); - if (WARN_ON(!dev_opp)) - goto out; - } - - dev_opp->np = opp_np; - dev_opp->shared_opp = of_property_read_bool(opp_np, - "opp-shared"); - } else { + if (ret) { of_free_opp_table(dev); + goto out; }
+ dev_opp = _find_device_opp(dev); + if (WARN_ON(!dev_opp)) + goto out; + + dev_opp->np = opp_np; + dev_opp->shared_opp = of_property_read_bool(opp_np, + "opp-shared"); + out: return ret; }