opp: Reorder the code for !target_freq case
authorViresh Kumar <viresh.kumar@linaro.org>
Fri, 15 May 2020 07:07:24 +0000 (12:37 +0530)
committerViresh Kumar <viresh.kumar@linaro.org>
Fri, 29 May 2020 04:45:12 +0000 (10:15 +0530)
Reorder the code a bit to make it more readable. Add additional comment
as well.

Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Clément Péron <peron.clem@gmail.com>
Tested-by: Clément Péron <peron.clem@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
drivers/opp/core.c

index c3ce39c..5e1035a 100644 (file)
@@ -817,15 +817,21 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
        }
 
        if (unlikely(!target_freq)) {
-               if (opp_table->required_opp_tables) {
-                       ret = _set_required_opps(dev, opp_table, NULL);
-               } else if (!_get_opp_count(opp_table)) {
+               /*
+                * Some drivers need to support cases where some platforms may
+                * have OPP table for the device, while others don't and
+                * opp_set_rate() just needs to behave like clk_set_rate().
+                */
+               if (!_get_opp_count(opp_table))
                        return 0;
-               } else {
+
+               if (!opp_table->required_opp_tables) {
                        dev_err(dev, "target frequency can't be 0\n");
                        ret = -EINVAL;
+                       goto put_opp_table;
                }
 
+               ret = _set_required_opps(dev, opp_table, NULL);
                goto put_opp_table;
        }