diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 15:19:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 15:19:31 +0200 |
| commit | 29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba (patch) | |
| tree | d3586c1f6a89150fcf24702b24aa21dcd7745f7b /drivers/cpufreq/speedstep-lib.c | |
| parent | 6f707daa3833761110a03478cba5cc4b708ec77d (diff) | |
| parent | b4f4b4b37133340befa354fbaa54d8e84ea86103 (diff) | |
| download | linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.tar.gz linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.tar.bz2 linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.zip | |
Merge back earlier cpufreq material for v4.7.
Diffstat (limited to 'drivers/cpufreq/speedstep-lib.c')
| -rw-r--r-- | drivers/cpufreq/speedstep-lib.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c index 15d3214aaa00..1b8062182c81 100644 --- a/drivers/cpufreq/speedstep-lib.c +++ b/drivers/cpufreq/speedstep-lib.c @@ -8,6 +8,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/moduleparam.h> @@ -153,7 +155,7 @@ static unsigned int pentium_core_get_frequency(void) fsb = 333333; break; default: - printk(KERN_ERR "PCORE - MSR_FSB_FREQ undefined value"); + pr_err("PCORE - MSR_FSB_FREQ undefined value\n"); } rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp); @@ -453,11 +455,8 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor, */ if (*transition_latency > 10000000 || *transition_latency < 50000) { - printk(KERN_WARNING PFX "frequency transition " - "measured seems out of range (%u " - "nSec), falling back to a safe one of" - "%u nSec.\n", - *transition_latency, 500000); + pr_warn("frequency transition measured seems out of range (%u nSec), falling back to a safe one of %u nSec\n", + *transition_latency, 500000); *transition_latency = 500000; } } |