mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
BACKPORT: 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: Ulf Hansson <ulf.hansson@linaro.org> Link: https://lore.kernel.org/r/20230925131715.138411-8-ulf.hansson@linaro.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Bug: 323966425 Change-Id: Ic2378e232588af5332cb7770287fec02342389eb (cherry picked from commit 033ca4de129646e9969a6838b44cca0fac38e219) [nikunj: Resolved minor conflict in drivers/firmware/arm_scmi/perf.c ] Signed-off-by: Nikunj Kela <quic_nkela@quicinc.com> Signed-off-by: Anant Goel <quic_anantg@quicinc.com>
This commit is contained in:
@@ -603,24 +603,19 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
|
||||
{
|
||||
int idx, ret;
|
||||
unsigned long freq;
|
||||
struct scmi_opp *opp;
|
||||
struct perf_dom_info *dom;
|
||||
|
||||
dom = scmi_perf_domain_lookup(ph, domain);
|
||||
if (IS_ERR(dom))
|
||||
return PTR_ERR(dom);
|
||||
|
||||
for (opp = dom->opp, idx = 0; idx < dom->opp_count; idx++, opp++) {
|
||||
freq = opp->perf * dom->mult_factor;
|
||||
for (idx = 0; idx < dom->opp_count; idx++) {
|
||||
freq = dom->opp[idx].perf * dom->mult_factor;
|
||||
|
||||
ret = dev_pm_opp_add(dev, freq, 0);
|
||||
if (ret) {
|
||||
dev_warn(dev, "failed to add opp %luHz\n", freq);
|
||||
|
||||
while (idx-- > 0) {
|
||||
freq = (--opp)->perf * dom->mult_factor;
|
||||
dev_pm_opp_remove(dev, freq);
|
||||
}
|
||||
dev_pm_opp_remove_all_dynamic(dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user