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/maple-cpufreq.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/maple-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/maple-cpufreq.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c index cc3408fc073f..d9df89392b84 100644 --- a/drivers/cpufreq/maple-cpufreq.c +++ b/drivers/cpufreq/maple-cpufreq.c @@ -13,6 +13,8 @@ #undef DEBUG +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/types.h> #include <linux/errno.h> @@ -174,7 +176,7 @@ static int __init maple_cpufreq_init(void) /* Get first CPU node */ cpunode = of_cpu_device_node_get(0); if (cpunode == NULL) { - printk(KERN_ERR "cpufreq: Can't find any CPU 0 node\n"); + pr_err("Can't find any CPU 0 node\n"); goto bail_noprops; } @@ -182,8 +184,7 @@ static int __init maple_cpufreq_init(void) /* we actually don't care on which CPU to access PVR */ pvr_hi = PVR_VER(mfspr(SPRN_PVR)); if (pvr_hi != 0x3c && pvr_hi != 0x44) { - printk(KERN_ERR "cpufreq: Unsupported CPU version (%x)\n", - pvr_hi); + pr_err("Unsupported CPU version (%x)\n", pvr_hi); goto bail_noprops; } @@ -222,8 +223,8 @@ static int __init maple_cpufreq_init(void) maple_pmode_cur = -1; maple_scom_switch_freq(maple_scom_query_freq()); - printk(KERN_INFO "Registering Maple CPU frequency driver\n"); - printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n", + pr_info("Registering Maple CPU frequency driver\n"); + pr_info("Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n", maple_cpu_freqs[1].frequency/1000, maple_cpu_freqs[0].frequency/1000, maple_cpu_freqs[maple_pmode_cur].frequency/1000); |