Commit 033ca4de authored by Ulf Hansson's avatar Ulf Hansson Committed by Sudeep Holla

firmware: arm_scmi: Simplify error path in scmi_dvfs_device_opps_add()

Let's simplify the code in scmi_dvfs_device_opps_add() by using
dev_pm_opp_remove_all_dynamic() in the error path.
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20230925131715.138411-8-ulf.hansson@linaro.orgSigned-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 0a30c0e9
...@@ -787,30 +787,22 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph, ...@@ -787,30 +787,22 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
{ {
int idx, ret; int idx, ret;
unsigned long freq; unsigned long freq;
struct scmi_opp *opp;
struct perf_dom_info *dom; struct perf_dom_info *dom;
dom = scmi_perf_domain_lookup(ph, domain); dom = scmi_perf_domain_lookup(ph, domain);
if (IS_ERR(dom)) if (IS_ERR(dom))
return PTR_ERR(dom); return PTR_ERR(dom);
for (opp = dom->opp, idx = 0; idx < dom->opp_count; idx++, opp++) { for (idx = 0; idx < dom->opp_count; idx++) {
if (!dom->level_indexing_mode) if (!dom->level_indexing_mode)
freq = opp->perf * dom->mult_factor; freq = dom->opp[idx].perf * dom->mult_factor;
else else
freq = opp->indicative_freq * 1000; freq = dom->opp[idx].indicative_freq * 1000;
ret = dev_pm_opp_add(dev, freq, 0); ret = dev_pm_opp_add(dev, freq, 0);
if (ret) { if (ret) {
dev_warn(dev, "failed to add opp %luHz\n", freq); dev_warn(dev, "failed to add opp %luHz\n", freq);
dev_pm_opp_remove_all_dynamic(dev);
while (idx-- > 0) {
if (!dom->level_indexing_mode)
freq = (--opp)->perf * dom->mult_factor;
else
freq = (--opp)->indicative_freq * 1000;
dev_pm_opp_remove(dev, freq);
}
return ret; return ret;
} }
......
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