diff options
author | Joe Perches <joe@perches.com> | 2016-04-05 16:28:23 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-08 19:33:42 -0400 |
commit | 4836df173aaed4b93e4d4b5c51e40f12e53ea26f (patch) | |
tree | 5c551466831ae2ecee040d17c4d6b159f7a6f051 /drivers/cpufreq | |
parent | d2499d05f0f286a754c26e2bda62210d6a65a774 (diff) |
intel_pstate: Use pr_fmt
Prefix the output using the more common kernel style.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
[ rjw: Rebase ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 8a368d2ee25c..1866705ee5da 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
@@ -10,6 +10,8 @@ | |||
10 | * of the License. | 10 | * of the License. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
14 | |||
13 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
14 | #include <linux/kernel_stat.h> | 16 | #include <linux/kernel_stat.h> |
15 | #include <linux/module.h> | 17 | #include <linux/module.h> |
@@ -571,7 +573,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b, | |||
571 | 573 | ||
572 | update_turbo_state(); | 574 | update_turbo_state(); |
573 | if (limits->turbo_disabled) { | 575 | if (limits->turbo_disabled) { |
574 | pr_warn("intel_pstate: Turbo disabled by BIOS or unavailable on processor\n"); | 576 | pr_warn("Turbo disabled by BIOS or unavailable on processor\n"); |
575 | return -EPERM; | 577 | return -EPERM; |
576 | } | 578 | } |
577 | 579 | ||
@@ -1239,7 +1241,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum) | |||
1239 | 1241 | ||
1240 | intel_pstate_busy_pid_reset(cpu); | 1242 | intel_pstate_busy_pid_reset(cpu); |
1241 | 1243 | ||
1242 | pr_debug("intel_pstate: controlling: cpu %d\n", cpunum); | 1244 | pr_debug("controlling: cpu %d\n", cpunum); |
1243 | 1245 | ||
1244 | return 0; | 1246 | return 0; |
1245 | } | 1247 | } |
@@ -1296,12 +1298,12 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) | |||
1296 | if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) { | 1298 | if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) { |
1297 | limits = &performance_limits; | 1299 | limits = &performance_limits; |
1298 | if (policy->max >= policy->cpuinfo.max_freq) { | 1300 | if (policy->max >= policy->cpuinfo.max_freq) { |
1299 | pr_debug("intel_pstate: set performance\n"); | 1301 | pr_debug("set performance\n"); |
1300 | intel_pstate_set_performance_limits(limits); | 1302 | intel_pstate_set_performance_limits(limits); |
1301 | goto out; | 1303 | goto out; |
1302 | } | 1304 | } |
1303 | } else { | 1305 | } else { |
1304 | pr_debug("intel_pstate: set powersave\n"); | 1306 | pr_debug("set powersave\n"); |
1305 | limits = &powersave_limits; | 1307 | limits = &powersave_limits; |
1306 | } | 1308 | } |
1307 | 1309 | ||
@@ -1353,7 +1355,7 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy) | |||
1353 | int cpu_num = policy->cpu; | 1355 | int cpu_num = policy->cpu; |
1354 | struct cpudata *cpu = all_cpu_data[cpu_num]; | 1356 | struct cpudata *cpu = all_cpu_data[cpu_num]; |
1355 | 1357 | ||
1356 | pr_debug("intel_pstate: CPU %d exiting\n", cpu_num); | 1358 | pr_debug("CPU %d exiting\n", cpu_num); |
1357 | 1359 | ||
1358 | intel_pstate_clear_update_util_hook(cpu_num); | 1360 | intel_pstate_clear_update_util_hook(cpu_num); |
1359 | 1361 | ||
@@ -1598,7 +1600,7 @@ hwp_cpu_matched: | |||
1598 | if (intel_pstate_platform_pwr_mgmt_exists()) | 1600 | if (intel_pstate_platform_pwr_mgmt_exists()) |
1599 | return -ENODEV; | 1601 | return -ENODEV; |
1600 | 1602 | ||
1601 | pr_info("Intel P-state driver initializing.\n"); | 1603 | pr_info("Intel P-state driver initializing\n"); |
1602 | 1604 | ||
1603 | all_cpu_data = vzalloc(sizeof(void *) * num_possible_cpus()); | 1605 | all_cpu_data = vzalloc(sizeof(void *) * num_possible_cpus()); |
1604 | if (!all_cpu_data) | 1606 | if (!all_cpu_data) |
@@ -1615,7 +1617,7 @@ hwp_cpu_matched: | |||
1615 | intel_pstate_sysfs_expose_params(); | 1617 | intel_pstate_sysfs_expose_params(); |
1616 | 1618 | ||
1617 | if (hwp_active) | 1619 | if (hwp_active) |
1618 | pr_info("intel_pstate: HWP enabled\n"); | 1620 | pr_info("HWP enabled\n"); |
1619 | 1621 | ||
1620 | return rc; | 1622 | return rc; |
1621 | out: | 1623 | out: |
@@ -1641,7 +1643,7 @@ static int __init intel_pstate_setup(char *str) | |||
1641 | if (!strcmp(str, "disable")) | 1643 | if (!strcmp(str, "disable")) |
1642 | no_load = 1; | 1644 | no_load = 1; |
1643 | if (!strcmp(str, "no_hwp")) { | 1645 | if (!strcmp(str, "no_hwp")) { |
1644 | pr_info("intel_pstate: HWP disabled\n"); | 1646 | pr_info("HWP disabled\n"); |
1645 | no_hwp = 1; | 1647 | no_hwp = 1; |
1646 | } | 1648 | } |
1647 | if (!strcmp(str, "force")) | 1649 | if (!strcmp(str, "force")) |