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/ia64-acpi-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/ia64-acpi-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/ia64-acpi-cpufreq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c index 0202429f1c5b..759612da4fdc 100644 --- a/drivers/cpufreq/ia64-acpi-cpufreq.c +++ b/drivers/cpufreq/ia64-acpi-cpufreq.c @@ -8,6 +8,8 @@ * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h> @@ -118,8 +120,7 @@ processor_get_freq ( if (ret) { set_cpus_allowed_ptr(current, &saved_mask); - printk(KERN_WARNING "get performance failed with error %d\n", - ret); + pr_warn("get performance failed with error %d\n", ret); ret = 0; goto migrate_end; } @@ -177,7 +178,7 @@ processor_set_freq ( ret = processor_set_pstate(value); if (ret) { - printk(KERN_WARNING "Transition failed with error %d\n", ret); + pr_warn("Transition failed with error %d\n", ret); retval = -ENODEV; goto migrate_end; } @@ -291,8 +292,7 @@ acpi_cpufreq_cpu_init ( /* notify BIOS that we exist */ acpi_processor_notify_smm(THIS_MODULE); - printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management " - "activated.\n", cpu); + pr_info("CPU%u - ACPI performance management activated\n", cpu); for (i = 0; i < data->acpi_data.state_count; i++) pr_debug(" %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n", |