aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2009-01-17 22:42:19 -0500
committerDave Jones <davej@redhat.com>2009-02-24 22:47:28 -0500
commit20174b65d9fdc8dddef3d2ab9647e01fdab13064 (patch)
tree4fb41a4e428ddde9dfb2c6b3991b27541db8b181 /arch/x86/kernel/cpu
parentb5c916666240032b29f73a1ca52c3e0fac37335c (diff)
[CPUFREQ] nforce2: Use driver prefix, not cpufreq prefix.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
index ad8284f0e865..99262906838c 100644
--- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
+++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
@@ -56,6 +56,7 @@ MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)");
56MODULE_PARM_DESC(min_fsb, 56MODULE_PARM_DESC(min_fsb,
57 "Minimum FSB to use, if not defined: current FSB - 50"); 57 "Minimum FSB to use, if not defined: current FSB - 50");
58 58
59#define PFX "cpufreq-nforce2: "
59#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \ 60#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
60 "cpufreq-nforce2", msg) 61 "cpufreq-nforce2", msg)
61 62
@@ -175,13 +176,13 @@ static int nforce2_set_fsb(unsigned int fsb)
175 int pll = 0; 176 int pll = 0;
176 177
177 if ((fsb > max_fsb) || (fsb < NFORCE2_MIN_FSB)) { 178 if ((fsb > max_fsb) || (fsb < NFORCE2_MIN_FSB)) {
178 printk(KERN_ERR "cpufreq: FSB %d is out of range!\n", fsb); 179 printk(KERN_ERR PFX "FSB %d is out of range!\n", fsb);
179 return -EINVAL; 180 return -EINVAL;
180 } 181 }
181 182
182 tfsb = nforce2_fsb_read(0); 183 tfsb = nforce2_fsb_read(0);
183 if (!tfsb) { 184 if (!tfsb) {
184 printk(KERN_ERR "cpufreq: Error while reading the FSB\n"); 185 printk(KERN_ERR PFX "Error while reading the FSB\n");
185 return -EINVAL; 186 return -EINVAL;
186 } 187 }
187 188
@@ -278,7 +279,7 @@ static int nforce2_target(struct cpufreq_policy *policy,
278 /* local_irq_save(flags); */ 279 /* local_irq_save(flags); */
279 280
280 if (nforce2_set_fsb(target_fsb) < 0) 281 if (nforce2_set_fsb(target_fsb) < 0)
281 printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", 282 printk(KERN_ERR PFX "Changing FSB to %d failed\n",
282 target_fsb); 283 target_fsb);
283 else 284 else
284 dprintk("Changed FSB successfully to %d\n", 285 dprintk("Changed FSB successfully to %d\n",
@@ -329,9 +330,8 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
329 /* FIX: Get FID from CPU */ 330 /* FIX: Get FID from CPU */
330 if (!fid) { 331 if (!fid) {
331 if (!cpu_khz) { 332 if (!cpu_khz) {
332 printk(KERN_WARNING 333 printk(KERN_WARNING PFX
333 "cpufreq: cpu_khz not set, " 334 "cpu_khz not set, can't calculate multiplier!\n");
334 "can't calculate multiplier!\n");
335 return -ENODEV; 335 return -ENODEV;
336 } 336 }
337 337
@@ -346,7 +346,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
346 } 346 }
347 } 347 }
348 348
349 printk(KERN_INFO "cpufreq: FSB currently at %i MHz, FID %d.%d\n", fsb, 349 printk(KERN_INFO PFX "FSB currently at %i MHz, FID %d.%d\n", fsb,
350 fid / 10, fid % 10); 350 fid / 10, fid % 10);
351 351
352 /* Set maximum FSB to FSB at boot time */ 352 /* Set maximum FSB to FSB at boot time */
@@ -402,10 +402,10 @@ static unsigned int nforce2_detect_chipset(void)
402 if (nforce2_dev == NULL) 402 if (nforce2_dev == NULL)
403 return -ENODEV; 403 return -ENODEV;
404 404
405 printk(KERN_INFO "cpufreq: Detected nForce2 chipset revision %X\n", 405 printk(KERN_INFO PFX "Detected nForce2 chipset revision %X\n",
406 nforce2_dev->revision); 406 nforce2_dev->revision);
407 printk(KERN_INFO 407 printk(KERN_INFO PFX
408 "cpufreq: FSB changing is maybe unstable and can lead to " 408 "FSB changing is maybe unstable and can lead to "
409 "crashes and data loss.\n"); 409 "crashes and data loss.\n");
410 410
411 return 0; 411 return 0;
@@ -424,7 +424,7 @@ static int __init nforce2_init(void)
424 424
425 /* detect chipset */ 425 /* detect chipset */
426 if (nforce2_detect_chipset()) { 426 if (nforce2_detect_chipset()) {
427 printk(KERN_ERR "cpufreq: No nForce2 chipset.\n"); 427 printk(KERN_ERR PFX "No nForce2 chipset.\n");
428 return -ENODEV; 428 return -ENODEV;
429 } 429 }
430 430