xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpufreq: Use consistent prefixing via pr_fmt

Browse Source 
Use the more common kernel style adding a define for pr_fmt.

Miscellanea:

o Remove now unused PFX defines

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Joe Perches
2016-04-05 13:28:25 -07:00
committed by Rafael J. Wysocki
parent b49c22a6ca
commit 1c5864e26c
25 changed files with 181 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/cpufreq/e_powersaver.c
View File

@@ -6,6 +6,8 @@
* BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -141,9 +143,9 @@ static int eps_set_state(struct eps_cpu_data *centaur,
/* Print voltage and multiplier */
rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
current_voltage = lo & 0xff;
pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);
pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);
current_multiplier = (lo >> 8) & 0xff;
pr_info("eps: Current multiplier = %d\n", current_multiplier);
pr_info("Current multiplier = %d\n", current_multiplier);
}
#endif
return 0;
@@ -164,7 +166,7 @@ static int eps_target(struct cpufreq_policy *policy, unsigned int index)
dest_state = centaur->freq_table[index].driver_data & 0xffff;
ret = eps_set_state(centaur, policy, dest_state);
if (ret)
pr_err("eps: Timeout!\n");
pr_err("Timeout!\n");
return ret;
}
@@ -192,7 +194,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
return -ENODEV;
/* Check brand */
pr_info("eps: Detected VIA ");
pr_info("Detected VIA ");
switch (c->x86_model) {
case 10:
@@ -233,7 +235,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
/* Can be locked at 0 */
rdmsrl(MSR_IA32_MISC_ENABLE, val);
if (!(val & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
pr_info("eps: Can't enable Enhanced PowerSaver\n");
pr_info("Can't enable Enhanced PowerSaver\n");
return -ENODEV;
}
}
@@ -241,19 +243,19 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
/* Print voltage and multiplier */
rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
current_voltage = lo & 0xff;
pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);
pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);
current_multiplier = (lo >> 8) & 0xff;
pr_info("eps: Current multiplier = %d\n", current_multiplier);
pr_info("Current multiplier = %d\n", current_multiplier);
/* Print limits */
max_voltage = hi & 0xff;
pr_info("eps: Highest voltage = %dmV\n", max_voltage * 16 + 700);
pr_info("Highest voltage = %dmV\n", max_voltage * 16 + 700);
max_multiplier = (hi >> 8) & 0xff;
pr_info("eps: Highest multiplier = %d\n", max_multiplier);
pr_info("Highest multiplier = %d\n", max_multiplier);
min_voltage = (hi >> 16) & 0xff;
pr_info("eps: Lowest voltage = %dmV\n", min_voltage * 16 + 700);
pr_info("Lowest voltage = %dmV\n", min_voltage * 16 + 700);
min_multiplier = (hi >> 24) & 0xff;
pr_info("eps: Lowest multiplier = %d\n", min_multiplier);
pr_info("Lowest multiplier = %d\n", min_multiplier);
/* Sanity checks */
if (current_multiplier == 0 || max_multiplier == 0
@@ -271,13 +273,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
/* Check for systems using underclocked CPU */
if (!freq_failsafe_off && max_multiplier != current_multiplier) {
pr_info("eps: Your processor is running at different frequency then its maximum. Aborting.\n");
pr_info("eps: You can use freq_failsafe_off option to disable this check.\n");
pr_info("Your processor is running at different frequency then its maximum. Aborting.\n");
pr_info("You can use freq_failsafe_off option to disable this check.\n");
return -EINVAL;
}
if (!voltage_failsafe_off && max_voltage != current_voltage) {
pr_info("eps: Your processor is running at different voltage then its maximum. Aborting.\n");
pr_info("eps: You can use voltage_failsafe_off option to disable this check.\n");
pr_info("Your processor is running at different voltage then its maximum. Aborting.\n");
pr_info("You can use voltage_failsafe_off option to disable this check.\n");
return -EINVAL;
}
@@ -288,13 +290,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
/* Check for ACPI processor speed limit */
if (!ignore_acpi_limit && !eps_acpi_init()) {
if (!acpi_processor_get_bios_limit(policy->cpu, &limit)) {
pr_info("eps: ACPI limit %u.%uGHz\n",
pr_info("ACPI limit %u.%uGHz\n",
limit/1000000,
(limit%1000000)/10000);
eps_acpi_exit(policy);
/* Check if max_multiplier is in BIOS limits */
if (limit && max_multiplier * fsb > limit) {
pr_info("eps: Aborting\n");
pr_info("Aborting\n");
return -EINVAL;
}
}
@@ -310,7 +312,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
v = (set_max_voltage - 700) / 16;
/* Check if voltage is within limits */
if (v >= min_voltage && v <= max_voltage) {
pr_info("eps: Setting %dmV as maximum\n", v * 16 + 700);
pr_info("Setting %dmV as maximum\n", v * 16 + 700);
max_voltage = v;
}
}