aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/p4-clockmod.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/cpufreq/p4-clockmod.c')
-rw-r--r--drivers/cpufreq/p4-clockmod.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index 4d1a44370338..fd77812313f3 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -20,6 +20,8 @@
20 * 20 *
21 */ 21 */
22 22
23#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
24
23#include <linux/kernel.h> 25#include <linux/kernel.h>
24#include <linux/module.h> 26#include <linux/module.h>
25#include <linux/init.h> 27#include <linux/init.h>
@@ -35,8 +37,6 @@
35 37
36#include "speedstep-lib.h" 38#include "speedstep-lib.h"
37 39
38#define PFX "p4-clockmod: "
39
40/* 40/*
41 * Duty Cycle (3bits), note DC_DISABLE is not specified in 41 * Duty Cycle (3bits), note DC_DISABLE is not specified in
42 * intel docs i just use it to mean disable 42 * intel docs i just use it to mean disable
@@ -124,7 +124,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
124{ 124{
125 if (c->x86 == 0x06) { 125 if (c->x86 == 0x06) {
126 if (cpu_has(c, X86_FEATURE_EST)) 126 if (cpu_has(c, X86_FEATURE_EST))
127 pr_warn_once(PFX "Warning: EST-capable CPU detected. The acpi-cpufreq module offers voltage scaling in addition to frequency scaling. You should use that instead of p4-clockmod, if possible.\n"); 127 pr_warn_once("Warning: EST-capable CPU detected. The acpi-cpufreq module offers voltage scaling in addition to frequency scaling. You should use that instead of p4-clockmod, if possible.\n");
128 switch (c->x86_model) { 128 switch (c->x86_model) {
129 case 0x0E: /* Core */ 129 case 0x0E: /* Core */
130 case 0x0F: /* Core Duo */ 130 case 0x0F: /* Core Duo */
@@ -148,7 +148,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
148 p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS; 148 p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
149 149
150 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) { 150 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
151 pr_warn(PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offer voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n"); 151 pr_warn("Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offer voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n");
152 return speedstep_get_frequency(SPEEDSTEP_CPU_P4M); 152 return speedstep_get_frequency(SPEEDSTEP_CPU_P4M);
153 } 153 }
154 154
@@ -257,7 +257,7 @@ static int __init cpufreq_p4_init(void)
257 257
258 ret = cpufreq_register_driver(&p4clockmod_driver); 258 ret = cpufreq_register_driver(&p4clockmod_driver);
259 if (!ret) 259 if (!ret)
260 pr_info(PFX "P4/Xeon(TM) CPU On-Demand Clock Modulation available\n"); 260 pr_info("P4/Xeon(TM) CPU On-Demand Clock Modulation available\n");
261 261
262 return ret; 262 return ret;
263} 263}