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

Commit 5fb00f96 authored by Viresh Kumar's avatar Viresh Kumar Committed by Arnd Bergmann
Browse files

SPEAr3xx: Replace printk() with pr_*() 



For better print logs/messages, it is advisable to use pr_*() routines instead
of directly calling printks. This patch removes direct calling of printks for
spear3xx.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
parent a3a4513b

arch/arm/mach-spear3xx/spear300.c

+5 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * warranty of any kind, whether express or implied.

 */



#define pr_fmt(fmt) "SPEAr300: " fmt



#include <linux/types.h>

#include <linux/amba/pl061.h>

#include <linux/ptrace.h>
@@ -447,7 +449,7 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 
	if (shirq_ras1.regs.base) {

		ret = spear_shirq_register(&shirq_ras1);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ\n");

			pr_err("Error registering Shared IRQ\n");

	}



	/* pmx initialization */
@@ -459,8 +461,8 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 
	if (pmx_driver.base) {

		ret = pmx_register(&pmx_driver);

		if (ret)

			printk(KERN_ERR "padmux: registration failed. err no"

					": %d\n", ret);

			pr_err("padmux: registration failed. err no: %d\n",

					ret);

		/* Free Mapping, device selection already done */

		iounmap(pmx_driver.base);

	}

arch/arm/mach-spear3xx/spear310.c

+7 −6
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * warranty of any kind, whether express or implied.

 */



#define pr_fmt(fmt) "SPEAr310: " fmt



#include <linux/ptrace.h>

#include <asm/irq.h>

#include <plat/shirq.h>
@@ -274,25 +276,25 @@ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 
		shirq_ras1.regs.base = base;

		ret = spear_shirq_register(&shirq_ras1);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 1\n");

			pr_err("Error registering Shared IRQ 1\n");



		/* shirq 2 */

		shirq_ras2.regs.base = base;

		ret = spear_shirq_register(&shirq_ras2);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 2\n");

			pr_err("Error registering Shared IRQ 2\n");



		/* shirq 3 */

		shirq_ras3.regs.base = base;

		ret = spear_shirq_register(&shirq_ras3);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 3\n");

			pr_err("Error registering Shared IRQ 3\n");



		/* shirq 4 */

		shirq_intrcomm_ras.regs.base = base;

		ret = spear_shirq_register(&shirq_intrcomm_ras);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 4\n");

			pr_err("Error registering Shared IRQ 4\n");

	}



	/* pmx initialization */
@@ -303,6 +305,5 @@ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 


	ret = pmx_register(&pmx_driver);

	if (ret)

		printk(KERN_ERR "padmux: registration failed. err no: %d\n",

				ret);

		pr_err("padmux: registration failed. err no: %d\n", ret);

}

arch/arm/mach-spear3xx/spear320.c

+6 −5
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * warranty of any kind, whether express or implied.

 */



#define pr_fmt(fmt) "SPEAr320: " fmt



#include <linux/ptrace.h>

#include <asm/irq.h>

#include <plat/shirq.h>
@@ -527,19 +529,19 @@ void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 
		shirq_ras1.regs.base = base;

		ret = spear_shirq_register(&shirq_ras1);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 1\n");

			pr_err("Error registering Shared IRQ 1\n");



		/* shirq 3 */

		shirq_ras3.regs.base = base;

		ret = spear_shirq_register(&shirq_ras3);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 3\n");

			pr_err("Error registering Shared IRQ 3\n");



		/* shirq 4 */

		shirq_intrcomm_ras.regs.base = base;

		ret = spear_shirq_register(&shirq_intrcomm_ras);

		if (ret)

			printk(KERN_ERR "Error registering Shared IRQ 4\n");

			pr_err("Error registering Shared IRQ 4\n");

	}



	/* pmx initialization */
@@ -550,6 +552,5 @@ void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, 


	ret = pmx_register(&pmx_driver);

	if (ret)

		printk(KERN_ERR "padmux: registration failed. err no: %d\n",

				ret);

		pr_err("padmux: registration failed. err no: %d\n", ret);

}

arch/arm/mach-spear3xx/spear3xx.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * warranty of any kind, whether express or implied.

 */



#define pr_fmt(fmt) "SPEAr3xx: " fmt



#include <linux/types.h>

#include <linux/amba/pl061.h>

#include <linux/ptrace.h>