1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 86de6c50fc41..03f4bd069ca8 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -47,21 +47,29 @@ static DEFINE_MUTEX(dev_pm_qos_mtx);
 static BLOCKING_NOTIFIER_HEAD(dev_pm_notifiers);
 
 /**
- * dev_pm_qos_read_value - Get PM QoS constraint for a given device.
+ * __dev_pm_qos_read_value - Get PM QoS constraint for a given device.
+ * @dev: Device to get the PM QoS constraint value for.
+ *
+ * This routine must be called with dev->power.lock held.
+ */
+s32 __dev_pm_qos_read_value(struct device *dev)
+{
+        struct pm_qos_constraints *c = dev->power.constraints;
+
+        return c ? pm_qos_read_value(c) : 0;
+}
+
+/**
+ * dev_pm_qos_read_value - Get PM QoS constraint for a given device (locked).
  * @dev: Device to get the PM QoS constraint value for.
  */
 s32 dev_pm_qos_read_value(struct device *dev)
 {
-        struct pm_qos_constraints *c;
         unsigned long flags;
-        s32 ret = 0;
+        s32 ret;
 
         spin_lock_irqsave(&dev->power.lock, flags);
-
-        c = dev->power.constraints;
-        if (c)
-                ret = pm_qos_read_value(c);
-
+        ret = __dev_pm_qos_read_value(dev);
         spin_unlock_irqrestore(&dev->power.lock, flags);
 
         return ret;