Commit 04a86a84 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki

PM / OPP: Error out on failing to add static OPPs for v1 bindings

The code adding static OPPs for V2 bindings already does so. Make the V1
bindings specific code behave the same.
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 63a69ea4
...@@ -433,7 +433,7 @@ static int _of_add_opp_table_v1(struct device *dev) ...@@ -433,7 +433,7 @@ static int _of_add_opp_table_v1(struct device *dev)
{ {
const struct property *prop; const struct property *prop;
const __be32 *val; const __be32 *val;
int nr; int nr, ret;
prop = of_find_property(dev->of_node, "operating-points", NULL); prop = of_find_property(dev->of_node, "operating-points", NULL);
if (!prop) if (!prop)
...@@ -456,9 +456,13 @@ static int _of_add_opp_table_v1(struct device *dev) ...@@ -456,9 +456,13 @@ static int _of_add_opp_table_v1(struct device *dev)
unsigned long freq = be32_to_cpup(val++) * 1000; unsigned long freq = be32_to_cpup(val++) * 1000;
unsigned long volt = be32_to_cpup(val++); unsigned long volt = be32_to_cpup(val++);
if (_opp_add_v1(dev, freq, volt, false)) ret = _opp_add_v1(dev, freq, volt, false);
dev_warn(dev, "%s: Failed to add OPP %ld\n", if (ret) {
__func__, freq); dev_err(dev, "%s: Failed to add OPP %ld (%d)\n",
__func__, freq, ret);
dev_pm_opp_of_remove_table(dev);
return ret;
}
nr -= 2; nr -= 2;
} }
......
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