Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c5864e2 authored by Joe Perches's avatar Joe Perches Committed by Rafael J. Wysocki
Browse files

cpufreq: Use consistent prefixing via pr_fmt 



Use the more common kernel style adding a define for pr_fmt.

Miscellanea:

o Remove now unused PFX defines

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b49c22a6

drivers/cpufreq/acpi-cpufreq.c

+4 −4
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>
@@ -50,8 +52,6 @@ MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski"); 
MODULE_DESCRIPTION("ACPI Processor P-States Driver");

MODULE_LICENSE("GPL");



#define PFX "acpi-cpufreq: "



enum {

	UNDEFINED_CAPABLE = 0,

	SYSTEM_INTEL_MSR_CAPABLE,
@@ -648,7 +648,7 @@ static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 
		if ((c->x86 == 15) &&

		    (c->x86_model == 6) &&

		    (c->x86_mask == 8)) {

			pr_info("acpi-cpufreq: Intel(R) Xeon(R) 7100 Errata AL30, processors may lock up on frequency changes: disabling acpi-cpufreq\n");

			pr_info("Intel(R) Xeon(R) 7100 Errata AL30, processors may lock up on frequency changes: disabling acpi-cpufreq\n");

			return -ENODEV;

		    }

		}
@@ -724,7 +724,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		cpumask_copy(data->freqdomain_cpus,

			     topology_sibling_cpumask(cpu));

		policy->shared_type = CPUFREQ_SHARED_TYPE_HW;

		pr_info_once(PFX "overriding BIOS provided _PSD data\n");

		pr_info_once("overriding BIOS provided _PSD data\n");

	}

#endif

drivers/cpufreq/cpufreq-nforce2.c

+10 −10
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>
@@ -56,8 +58,6 @@ MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); 
MODULE_PARM_DESC(min_fsb,

		"Minimum FSB to use, if not defined: current FSB - 50");



#define PFX "cpufreq-nforce2: "



/**

 * nforce2_calc_fsb - calculate FSB

 * @pll: PLL value
@@ -174,13 +174,13 @@ static int nforce2_set_fsb(unsigned int fsb) 
	int pll = 0;



	if ((fsb > max_fsb) || (fsb < NFORCE2_MIN_FSB)) {

		pr_err(PFX "FSB %d is out of range!\n", fsb);

		pr_err("FSB %d is out of range!\n", fsb);

		return -EINVAL;

	}



	tfsb = nforce2_fsb_read(0);

	if (!tfsb) {

		pr_err(PFX "Error while reading the FSB\n");

		pr_err("Error while reading the FSB\n");

		return -EINVAL;

	}
@@ -276,7 +276,7 @@ static int nforce2_target(struct cpufreq_policy *policy, 
	/* local_irq_save(flags); */



	if (nforce2_set_fsb(target_fsb) < 0)

		pr_err(PFX "Changing FSB to %d failed\n", target_fsb);

		pr_err("Changing FSB to %d failed\n", target_fsb);

	else

		pr_debug("Changed FSB successfully to %d\n",

			target_fsb);
@@ -324,7 +324,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) 
	/* FIX: Get FID from CPU */

	if (!fid) {

		if (!cpu_khz) {

			pr_warn(PFX "cpu_khz not set, can't calculate multiplier!\n");

			pr_warn("cpu_khz not set, can't calculate multiplier!\n");

			return -ENODEV;

		}
@@ -339,7 +339,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) 
		}

	}



	pr_info(PFX "FSB currently at %i MHz, FID %d.%d\n",

	pr_info("FSB currently at %i MHz, FID %d.%d\n",

		fsb, fid / 10, fid % 10);



	/* Set maximum FSB to FSB at boot time */
@@ -399,9 +399,9 @@ static int nforce2_detect_chipset(void) 
	if (nforce2_dev == NULL)

		return -ENODEV;



	pr_info(PFX "Detected nForce2 chipset revision %X\n",

	pr_info("Detected nForce2 chipset revision %X\n",

		nforce2_dev->revision);

	pr_info(PFX "FSB changing is maybe unstable and can lead to crashes and data loss\n");

	pr_info("FSB changing is maybe unstable and can lead to crashes and data loss\n");



	return 0;

}
@@ -419,7 +419,7 @@ static int __init nforce2_init(void) 


	/* detect chipset */

	if (nforce2_detect_chipset()) {

		pr_info(PFX "No nForce2 chipset\n");

		pr_info("No nForce2 chipset\n");

		return -ENODEV;

	}

drivers/cpufreq/e_powersaver.c

+20 −18
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>
@@ -141,9 +143,9 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
	/* Print voltage and multiplier */

	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	current_voltage = lo & 0xff;

	pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);

	pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);

	current_multiplier = (lo >> 8) & 0xff;

	pr_info("eps: Current multiplier = %d\n", current_multiplier);

	pr_info("Current multiplier = %d\n", current_multiplier);

	}

#endif

	return 0;
@@ -164,7 +166,7 @@ static int eps_target(struct cpufreq_policy *policy, unsigned int index) 
	dest_state = centaur->freq_table[index].driver_data & 0xffff;

	ret = eps_set_state(centaur, policy, dest_state);

	if (ret)

		pr_err("eps: Timeout!\n");

		pr_err("Timeout!\n");

	return ret;

}
@@ -192,7 +194,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
		return -ENODEV;



	/* Check brand */

	pr_info("eps: Detected VIA ");

	pr_info("Detected VIA ");



	switch (c->x86_model) {

	case 10:
@@ -233,7 +235,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
		/* Can be locked at 0 */

		rdmsrl(MSR_IA32_MISC_ENABLE, val);

		if (!(val & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {

			pr_info("eps: Can't enable Enhanced PowerSaver\n");

			pr_info("Can't enable Enhanced PowerSaver\n");

			return -ENODEV;

		}

	}
@@ -241,19 +243,19 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
	/* Print voltage and multiplier */

	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	current_voltage = lo & 0xff;

	pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);

	pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);

	current_multiplier = (lo >> 8) & 0xff;

	pr_info("eps: Current multiplier = %d\n", current_multiplier);

	pr_info("Current multiplier = %d\n", current_multiplier);



	/* Print limits */

	max_voltage = hi & 0xff;

	pr_info("eps: Highest voltage = %dmV\n", max_voltage * 16 + 700);

	pr_info("Highest voltage = %dmV\n", max_voltage * 16 + 700);

	max_multiplier = (hi >> 8) & 0xff;

	pr_info("eps: Highest multiplier = %d\n", max_multiplier);

	pr_info("Highest multiplier = %d\n", max_multiplier);

	min_voltage = (hi >> 16) & 0xff;

	pr_info("eps: Lowest voltage = %dmV\n", min_voltage * 16 + 700);

	pr_info("Lowest voltage = %dmV\n", min_voltage * 16 + 700);

	min_multiplier = (hi >> 24) & 0xff;

	pr_info("eps: Lowest multiplier = %d\n", min_multiplier);

	pr_info("Lowest multiplier = %d\n", min_multiplier);



	/* Sanity checks */

	if (current_multiplier == 0 || max_multiplier == 0
@@ -271,13 +273,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 


	/* Check for systems using underclocked CPU */

	if (!freq_failsafe_off && max_multiplier != current_multiplier) {

		pr_info("eps: Your processor is running at different frequency then its maximum. Aborting.\n");

		pr_info("eps: You can use freq_failsafe_off option to disable this check.\n");

		pr_info("Your processor is running at different frequency then its maximum. Aborting.\n");

		pr_info("You can use freq_failsafe_off option to disable this check.\n");

		return -EINVAL;

	}

	if (!voltage_failsafe_off && max_voltage != current_voltage) {

		pr_info("eps: Your processor is running at different voltage then its maximum. Aborting.\n");

		pr_info("eps: You can use voltage_failsafe_off option to disable this check.\n");

		pr_info("Your processor is running at different voltage then its maximum. Aborting.\n");

		pr_info("You can use voltage_failsafe_off option to disable this check.\n");

		return -EINVAL;

	}
@@ -288,13 +290,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
	/* Check for ACPI processor speed limit */

	if (!ignore_acpi_limit && !eps_acpi_init()) {

		if (!acpi_processor_get_bios_limit(policy->cpu, &limit)) {

			pr_info("eps: ACPI limit %u.%uGHz\n",

			pr_info("ACPI limit %u.%uGHz\n",

				limit/1000000,

				(limit%1000000)/10000);

			eps_acpi_exit(policy);

			/* Check if max_multiplier is in BIOS limits */

			if (limit && max_multiplier * fsb > limit) {

				pr_info("eps: Aborting\n");

				pr_info("Aborting\n");

				return -EINVAL;

			}

		}
@@ -310,7 +312,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
		v = (set_max_voltage - 700) / 16;

		/* Check if voltage is within limits */

		if (v >= min_voltage && v <= max_voltage) {

			pr_info("eps: Setting %dmV as maximum\n", v * 16 + 700);

			pr_info("Setting %dmV as maximum\n", v * 16 + 700);

			max_voltage = v;

		}

	}

drivers/cpufreq/elanfreq.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

drivers/cpufreq/ia64-acpi-cpufreq.c

+3 −2
Original line number Diff line number Diff line
@@ -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>
@@ -290,8 +292,7 @@ acpi_cpufreq_cpu_init ( 
	/* notify BIOS that we exist */

	acpi_processor_notify_smm(THIS_MODULE);



	pr_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",