diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-18 09:49:30 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-18 09:49:30 +0200 |
commit | 918e162e6a71e924a343b41f71789ad14e1e3229 (patch) | |
tree | fe26a3ee0f78ac652fed532c4986af7469c71859 /drivers/cpuidle | |
parent | 8da04e05cdfc715d414a1c5f8318c03030eb68fb (diff) | |
parent | c4dcc8a162784c1f827c7f6d8409598f19708fe6 (diff) | |
download | linux-918e162e6a71e924a343b41f71789ad14e1e3229.tar.gz linux-918e162e6a71e924a343b41f71789ad14e1e3229.tar.bz2 linux-918e162e6a71e924a343b41f71789ad14e1e3229.zip |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Make cpufreq_generic_init() return void
cpufreq: imx-cpufreq-dt: Add i.MX8MN support
cpufreq: Add QoS requests for userspace constraints
cpufreq: intel_pstate: Reuse refresh_frequency_limits()
cpufreq: Register notifiers with the PM QoS framework
PM / QoS: Add support for MIN/MAX frequency constraints
PM / QOS: Pass request type to dev_pm_qos_read_value()
PM / QOS: Rename __dev_pm_qos_read_value() and dev_pm_qos_raw_read_value()
PM / QOS: Pass request type to dev_pm_qos_{add|remove}_notifier()
Diffstat (limited to 'drivers/cpuidle')
-rw-r--r-- | drivers/cpuidle/governor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c index 9fddf828a76f..2e3e14192bee 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -110,7 +110,7 @@ int 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_read_value(device); + int device_req = dev_pm_qos_raw_resume_latency(device); return device_req < global_req ? device_req : global_req; } |