firmware: arm_scmi: Simplify error path in scmi_dvfs_device_opps_add()

[ Upstream commit 033ca4de129646e9969a6838b44cca0fac38e219 ]

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>
Stable-dep-of: 77f5032e94f2 ("firmware: arm_scmi: Fix possible frequency truncation when using level indexing mode")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 7aa9b4ff48d6176c680f5b433883adb072b9f783..596316e6e1ba364142f0b7644eee4f9aec3a9f76 100644 (file)
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -799,7 +799,6 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
 {
        int idx, ret, domain;
        unsigned long freq;
-       struct scmi_opp *opp;
        struct perf_dom_info *dom;
 
        domain = scmi_dev_domain_id(dev);
@@ -810,23 +809,16 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
        if (IS_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)
-                       freq = opp->perf * dom->mult_factor;
+                       freq = dom->opp[idx].perf * dom->mult_factor;
                else
-                       freq = opp->indicative_freq * 1000;
+                       freq = dom->opp[idx].indicative_freq * 1000;
 
                ret = dev_pm_opp_add(dev, freq, 0);
                if (ret) {
                        dev_warn(dev, "failed to add opp %luHz\n", freq);
-
-                       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);
-                       }
+                       dev_pm_opp_remove_all_dynamic(dev);
                        return ret;
                }