aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/intel_pstate.c
diff options
context:
space:
mode:
authorDoug Smythies <doug.smythies@gmail.com>2015-05-31 10:46:47 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-09 19:57:14 -0400
commitf16255eb930173f386db0ce78ed41401aa8a94a6 (patch)
tree571ab4dd5c07d44214b61d1bb4ac65b94ba76a6e /drivers/cpufreq/intel_pstate.c
parent9d16f207112f77711600fb0770182a06e056e5de (diff)
intel_pstate: change some inconsistent debug information
Commit ce717613f3fb (intel_pstate: Turn per cpu printk into pr_debug) turned per cpu printk into pr_debug. However, only half of the change was done, introducing an inconsistency between entry and exit from driver pstate control. This patch changes the exit message to pr_debug also. The various messages are inconsistent with respect to any identifier text that can be used to help isolate the desired information from a huge log. This patch makes a consistent identifier portion of the string. Amends: ce717613f3fb (intel_pstate: Turn per cpu printk into pr_debug) Signed-off-by: Doug Smythies <dsmythies@telus.net> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
-rw-r--r--drivers/cpufreq/intel_pstate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 2f329b45eacd..2050796afd77 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -398,7 +398,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
398 398
399 update_turbo_state(); 399 update_turbo_state();
400 if (limits.turbo_disabled) { 400 if (limits.turbo_disabled) {
401 pr_warn("Turbo disabled by BIOS or unavailable on processor\n"); 401 pr_warn("intel_pstate: Turbo disabled by BIOS or unavailable on processor\n");
402 return -EPERM; 402 return -EPERM;
403 } 403 }
404 404
@@ -486,7 +486,7 @@ static void __init intel_pstate_sysfs_expose_params(void)
486static void intel_pstate_hwp_enable(void) 486static void intel_pstate_hwp_enable(void)
487{ 487{
488 hwp_active++; 488 hwp_active++;
489 pr_info("intel_pstate HWP enabled\n"); 489 pr_info("intel_pstate: HWP enabled\n");
490 490
491 wrmsrl( MSR_PM_ENABLE, 0x1); 491 wrmsrl( MSR_PM_ENABLE, 0x1);
492} 492}
@@ -946,7 +946,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
946 946
947 add_timer_on(&cpu->timer, cpunum); 947 add_timer_on(&cpu->timer, cpunum);
948 948
949 pr_debug("Intel pstate controlling: cpu %d\n", cpunum); 949 pr_debug("intel_pstate: controlling: cpu %d\n", cpunum);
950 950
951 return 0; 951 return 0;
952} 952}
@@ -1012,7 +1012,7 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
1012 int cpu_num = policy->cpu; 1012 int cpu_num = policy->cpu;
1013 struct cpudata *cpu = all_cpu_data[cpu_num]; 1013 struct cpudata *cpu = all_cpu_data[cpu_num];
1014 1014
1015 pr_info("intel_pstate CPU %d exiting\n", cpu_num); 1015 pr_debug("intel_pstate: CPU %d exiting\n", cpu_num);
1016 1016
1017 del_timer_sync(&all_cpu_data[cpu_num]->timer); 1017 del_timer_sync(&all_cpu_data[cpu_num]->timer);
1018 if (hwp_active) 1018 if (hwp_active)