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

Commit dc457078 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

ARM: 7415/1: vfp: convert printk's to pr_*'s 



This is mainly to get rid of the "vfp_pm_suspend: saving vfp state"
message flooding the kernel message ring by default.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1fdc08ab

arch/arm/vfp/vfpmodule.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -238,11 +238,11 @@ static void vfp_panic(char *reason, u32 inst) 
{

{

	int i;

	int i;





	printk(KERN_ERR "VFP: Error: %s\n", reason);

	pr_err("VFP: Error: %s\n", reason);

	printk(KERN_ERR "VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n",

	pr_err("VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n",

		fmrx(FPEXC), fmrx(FPSCR), inst);

		fmrx(FPEXC), fmrx(FPSCR), inst);

	for (i = 0; i < 32; i += 2)

	for (i = 0; i < 32; i += 2)

		printk(KERN_ERR "VFP: s%2u: 0x%08x s%2u: 0x%08x\n",

		pr_err("VFP: s%2u: 0x%08x s%2u: 0x%08x\n",

		       i, vfp_get_float(i), i+1, vfp_get_float(i+1));

		       i, vfp_get_float(i), i+1, vfp_get_float(i+1));

}

}
@@ -446,7 +446,7 @@ static int vfp_pm_suspend(void) 




	/* if vfp is on, then save state for resumption */

	/* if vfp is on, then save state for resumption */

	if (fpexc & FPEXC_EN) {

	if (fpexc & FPEXC_EN) {

		printk(KERN_DEBUG "%s: saving vfp state\n", __func__);

		pr_debug("%s: saving vfp state\n", __func__);

		vfp_save_state(&ti->vfpstate, fpexc);

		vfp_save_state(&ti->vfpstate, fpexc);





		/* disable, just in case */

		/* disable, just in case */
@@ -571,18 +571,18 @@ static int __init vfp_init(void) 
	barrier();

	barrier();

	vfp_vector = vfp_null_entry;

	vfp_vector = vfp_null_entry;





	printk(KERN_INFO "VFP support v0.3: ");

	pr_info("VFP support v0.3: ");

	if (VFP_arch)

	if (VFP_arch)

		printk("not present\n");

		pr_cont("not present\n");

	else if (vfpsid & FPSID_NODOUBLE) {

	else if (vfpsid & FPSID_NODOUBLE) {

		printk("no double precision support\n");

		pr_cont("no double precision support\n");

	} else {

	} else {

		hotcpu_notifier(vfp_hotplug, 0);

		hotcpu_notifier(vfp_hotplug, 0);





		smp_call_function(vfp_enable, NULL, 1);

		smp_call_function(vfp_enable, NULL, 1);





		VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */

		VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */

		printk("implementor %02x architecture %d part %02x variant %x rev %x\n",

		pr_cont("implementor %02x architecture %d part %02x variant %x rev %x\n",

			(vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,

			(vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,

			(vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT,

			(vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT,

			(vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT,

			(vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT,