diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-09 14:20:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-09 14:20:07 +0200 |
| commit | a5950f2617f71a3dce16520c4907bcdb31e654ba (patch) | |
| tree | 9e56b5eb5119737538a4763ec74a4271e5788a00 /kernel/power/qos.c | |
| parent | 87cbde8d9081b91df86a21d0d743cd700e04890a (diff) | |
| parent | eb672c0239da9084fc8103b63ba5fdaec6aab8be (diff) | |
Merge back suspend/resume/hibernate material for v4.15.
Diffstat (limited to 'kernel/power/qos.c')
| -rw-r--r-- | kernel/power/qos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 97b0df71303e..9d7503910ce2 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -701,8 +701,8 @@ static int __init pm_qos_power_init(void) for (i = PM_QOS_CPU_DMA_LATENCY; i < PM_QOS_NUM_CLASSES; i++) { ret = register_pm_qos_misc(pm_qos_array[i], d); if (ret < 0) { - printk(KERN_ERR "pm_qos_param: %s setup failed\n", - pm_qos_array[i]->name); + pr_err("%s: %s setup failed\n", + __func__, pm_qos_array[i]->name); return ret; } } |