From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 11 Feb 2020 23:08:42 +0000 (+0100)
Subject: cpuidle: Call cpu_latency_qos_limit() instead of pm_qos_request()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f60ccc3558dd83c4db68736625642d54bf38a6db;p=linux.git

cpuidle: Call cpu_latency_qos_limit() instead of pm_qos_request()

Call cpu_latency_qos_limit() instead of pm_qos_request(), because the
latter is going to be dropped.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>
---

diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
index e48271e117a32..29acaf48e5758 100644
--- a/drivers/cpuidle/governor.c
+++ b/drivers/cpuidle/governor.c
@@ -109,9 +109,9 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
  */
 s64 cpuidle_governor_latency_req(unsigned int cpu)
 {
-	int global_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
 	struct device *device = get_cpu_device(cpu);
 	int device_req = dev_pm_qos_raw_resume_latency(device);
+	int global_req = cpu_latency_qos_limit();
 
 	if (device_req > global_req)
 		device_req = global_req;