From fa7597724996249413fcdfa8ccdaa1b40d41e381 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 7 Oct 2003 19:11:49 +0100 Subject: [PATCH] [CPUFREQ] powernow-k8 Namespace cleanups. More bits from Pavel. drv_* in oopses is pretty uninformative. --- arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 26 +++++++++++----------- arch/i386/kernel/cpu/cpufreq/powernow-k8.h | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index 41071099c6c34..84735832e29dc 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c @@ -72,9 +72,9 @@ static u32 batps; /* limit on the number of p states when on battery */ /* - set by BIOS in the PSB/PST */ static struct cpufreq_driver cpufreq_amd64_driver = { - .verify = drv_verify, - .target = drv_target, - .init = drv_cpu_init, + .verify = powernowk8_verify, + .target = powernowk8_target, + .init = powernowk8_cpu_init, .name = "cpufreq-amd64", .owner = THIS_MODULE, }; @@ -90,7 +90,7 @@ find_freq_from_fid(u32 fid) } /* Return a fid matching an input frequency in MHz */ -u32 +static u32 find_fid_from_freq(u32 freq) { return (freq - 800) / 100; @@ -861,7 +861,7 @@ transition_frequency(u32 * preq, u32 * pmin, u32 * pmax, u32 searchup) /* Driver entry point to switch to the target frequency */ static int -drv_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation) +powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation) { u32 checkfid = currfid; u32 checkvid = currvid; @@ -909,7 +909,7 @@ drv_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation) /* Driver entry point to verify the policy and range of frequencies */ static int -drv_verify(struct cpufreq_policy *pol) +powernowk8_verify(struct cpufreq_policy *pol) { u32 min = pol->min / 1000; u32 max = pol->max / 1000; @@ -948,7 +948,7 @@ drv_verify(struct cpufreq_policy *pol) /* per CPU init entry point to the driver */ static int __init -drv_cpu_init(struct cpufreq_policy *pol) +powernowk8_cpu_init(struct cpufreq_policy *pol) { if (pol->cpu != 0) { printk(KERN_ERR PFX "init not cpu 0\n"); @@ -981,7 +981,7 @@ drv_cpu_init(struct cpufreq_policy *pol) /* driver entry point for init */ static int __init -drv_init(void) +powernowk8_init(void) { int rc; @@ -995,7 +995,7 @@ drv_init(void) return rc; if (pending_bit_stuck()) { - printk(KERN_ERR PFX "drv_init fail, change pending bit set\n"); + printk(KERN_ERR PFX "powernowk8_init fail, change pending bit set\n"); kfree(ppst); return -EIO; } @@ -1005,9 +1005,9 @@ drv_init(void) /* driver entry point for term */ static void __exit -drv_exit(void) +powernowk8_exit(void) { - dprintk(KERN_INFO PFX "drv_exit\n"); + dprintk(KERN_INFO PFX "powernowk8_exit\n"); cpufreq_unregister_driver(&cpufreq_amd64_driver); kfree(ppst); @@ -1017,5 +1017,5 @@ MODULE_AUTHOR("Paul Devriendt "); MODULE_DESCRIPTION("AMD Athlon 64 and Opteron processor frequency driver."); MODULE_LICENSE("GPL"); -module_init(drv_init); -module_exit(drv_exit); +module_init(powernowk8_init); +module_exit(powernowk8_exit); diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h b/arch/i386/kernel/cpu/cpufreq/powernow-k8.h index b0031b37c0b06..b0ac14d1b0df9 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.h @@ -120,7 +120,7 @@ struct pst_s { static inline int core_voltage_pre_transition(u32 reqvid); static inline int core_voltage_post_transition(u32 reqvid); static inline int core_frequency_transition(u32 reqfid); -static int drv_verify(struct cpufreq_policy *pol); -static int drv_target(struct cpufreq_policy *pol, unsigned targfreq, +static int powernowk8_verify(struct cpufreq_policy *pol); +static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation); -static int __init drv_cpu_init(struct cpufreq_policy *pol); +static int __init powernowk8_cpu_init(struct cpufreq_policy *pol); -- 2.53.0