Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: s5pv210-cpufreq: fix wrong do_div() usage
  MAINTAINERS: update for intel P-state driver
  cpufreq: governor: Quit work-handlers early if governor is stopped
  intel_pstate: decrease number of "HWP enabled" messages
  cpufreq: arm_big_little: fix frequency check when bL switcher is active

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 93a3c635ea27..2e31d097def6 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -684,8 +684,6 @@ static void __init intel_pstate_sysfs_expose_params(void)
 
 static void intel_pstate_hwp_enable(struct cpudata *cpudata)
 {
-        pr_info("intel_pstate: HWP enabled\n");
-
         wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1);
 }
 
@@ -1557,8 +1555,10 @@ static int __init intel_pstate_init(void)
         if (!all_cpu_data)
                 return -ENOMEM;
 
-        if (static_cpu_has_safe(X86_FEATURE_HWP) && !no_hwp)
+        if (static_cpu_has_safe(X86_FEATURE_HWP) && !no_hwp) {
+                pr_info("intel_pstate: HWP enabled\n");
                 hwp_active++;
+        }
 
         if (!hwp_active && hwp_only)
                 goto out;
@@ -1593,8 +1593,10 @@ static int __init intel_pstate_setup(char *str)
 
         if (!strcmp(str, "disable"))
                 no_load = 1;
-        if (!strcmp(str, "no_hwp"))
+        if (!strcmp(str, "no_hwp")) {
+                pr_info("intel_pstate: HWP disabled\n");
                 no_hwp = 1;
+        }
         if (!strcmp(str, "force"))
                 force_load = 1;
         if (!strcmp(str, "hwp_only"))