summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/elanfreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-28 15:19:31 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-28 15:19:31 +0200
commit29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba (patch)
treed3586c1f6a89150fcf24702b24aa21dcd7745f7b /drivers/cpufreq/elanfreq.c
parent6f707daa3833761110a03478cba5cc4b708ec77d (diff)
parentb4f4b4b37133340befa354fbaa54d8e84ea86103 (diff)
downloadlinux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.tar.gz
linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.tar.bz2
linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.zip
Merge back earlier cpufreq material for v4.7.
Diffstat (limited to 'drivers/cpufreq/elanfreq.c')
-rw-r--r--drivers/cpufreq/elanfreq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index 1c06e786c9ba..bfce11cba1df 100644
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -16,6 +16,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -185,7 +187,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
static int __init elanfreq_setup(char *str)
{
max_freq = simple_strtoul(str, &str, 0);
- printk(KERN_WARNING "You're using the deprecated elanfreq command line option. Use elanfreq.max_freq instead, please!\n");
+ pr_warn("You're using the deprecated elanfreq command line option. Use elanfreq.max_freq instead, please!\n");
return 1;
}
__setup("elanfreq=", elanfreq_setup);