PM / OPP don't match for existing OPPs when list is empty

OPP list is guaranteed to be empty when 'dev_opp' is created. And so we don't
need to run the comparison loop with existing OPPs.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 76ae6fd..a333e2e 100644 (file)
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -417,6 +417,12 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
        /* Hold our list modification lock here */
        mutex_lock(&dev_opp_list_lock);
 
+       /* populate the opp table */
+       new_opp->dev_opp = dev_opp;
+       new_opp->rate = freq;
+       new_opp->u_volt = u_volt;
+       new_opp->available = true;
+
        /* Check for existing list for 'dev' */
        dev_opp = find_device_opp(dev);
        if (IS_ERR(dev_opp)) {
@@ -441,14 +447,10 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
 
                /* Secure the device list modification */
                list_add_rcu(&dev_opp->node, &dev_opp_list);
+               head = &dev_opp->opp_list;
+               goto list_add;
        }
 
-       /* populate the opp table */
-       new_opp->dev_opp = dev_opp;
-       new_opp->rate = freq;
-       new_opp->u_volt = u_volt;
-       new_opp->available = true;
-
        /*
         * Insert new OPP in order of increasing frequency
         * and discard if already present
@@ -474,6 +476,7 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
                return ret;
        }
 
+list_add:
        list_add_rcu(&new_opp->node, head);
        mutex_unlock(&dev_opp_list_lock);