torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

SPEAr3xx: Replace printk() with pr_*()

Browse Source 
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: Viresh Kumar <viresh.kumar@st.com>
This commit is contained in:
Viresh Kumar 2012-03-26 10:39:43 +05:30 committed by Arnd Bergmann
parent a3a4513b69
commit 5fb00f965e
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-spear3xx/spear300.c
View File

@ -11,6 +11,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#define pr_fmt(fmt) "SPEAr300: " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/amba/pl061.h> #include <linux/amba/pl061.h>
#include <linux/ptrace.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) { if (shirq_ras1.regs.base) {
ret = spear_shirq_register(&shirq_ras1); ret = spear_shirq_register(&shirq_ras1);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ\n"); pr_err("Error registering Shared IRQ\n");
} }
/* pmx initialization */ /* pmx initialization */
@ -459,8 +461,8 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
if (pmx_driver.base) { if (pmx_driver.base) {
ret = pmx_register(&pmx_driver); ret = pmx_register(&pmx_driver);
if (ret) if (ret)
printk(KERN_ERR "padmux: registration failed. err no" pr_err("padmux: registration failed. err no: %d\n",
": %d\n", ret); ret);
/* Free Mapping, device selection already done */ /* Free Mapping, device selection already done */
iounmap(pmx_driver.base); iounmap(pmx_driver.base);
} }

13
arch/arm/mach-spear3xx/spear310.c
View File

@ -11,6 +11,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#define pr_fmt(fmt) "SPEAr310: " fmt
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/shirq.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; shirq_ras1.regs.base = base;
ret = spear_shirq_register(&shirq_ras1); ret = spear_shirq_register(&shirq_ras1);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 1\n"); pr_err("Error registering Shared IRQ 1\n");
/* shirq 2 */ /* shirq 2 */
shirq_ras2.regs.base = base; shirq_ras2.regs.base = base;
ret = spear_shirq_register(&shirq_ras2); ret = spear_shirq_register(&shirq_ras2);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 2\n"); pr_err("Error registering Shared IRQ 2\n");
/* shirq 3 */ /* shirq 3 */
shirq_ras3.regs.base = base; shirq_ras3.regs.base = base;
ret = spear_shirq_register(&shirq_ras3); ret = spear_shirq_register(&shirq_ras3);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 3\n"); pr_err("Error registering Shared IRQ 3\n");
/* shirq 4 */ /* shirq 4 */
shirq_intrcomm_ras.regs.base = base; shirq_intrcomm_ras.regs.base = base;
ret = spear_shirq_register(&shirq_intrcomm_ras); ret = spear_shirq_register(&shirq_intrcomm_ras);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 4\n"); pr_err("Error registering Shared IRQ 4\n");
} }
/* pmx initialization */ /* 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); ret = pmx_register(&pmx_driver);
if (ret) if (ret)
printk(KERN_ERR "padmux: registration failed. err no: %d\n", pr_err("padmux: registration failed. err no: %d\n", ret);
ret);
} }

11
arch/arm/mach-spear3xx/spear320.c
View File

@ -11,6 +11,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#define pr_fmt(fmt) "SPEAr320: " fmt
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/shirq.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; shirq_ras1.regs.base = base;
ret = spear_shirq_register(&shirq_ras1); ret = spear_shirq_register(&shirq_ras1);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 1\n"); pr_err("Error registering Shared IRQ 1\n");
/* shirq 3 */ /* shirq 3 */
shirq_ras3.regs.base = base; shirq_ras3.regs.base = base;
ret = spear_shirq_register(&shirq_ras3); ret = spear_shirq_register(&shirq_ras3);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 3\n"); pr_err("Error registering Shared IRQ 3\n");
/* shirq 4 */ /* shirq 4 */
shirq_intrcomm_ras.regs.base = base; shirq_intrcomm_ras.regs.base = base;
ret = spear_shirq_register(&shirq_intrcomm_ras); ret = spear_shirq_register(&shirq_intrcomm_ras);
if (ret) if (ret)
printk(KERN_ERR "Error registering Shared IRQ 4\n"); pr_err("Error registering Shared IRQ 4\n");
} }
/* pmx initialization */ /* 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); ret = pmx_register(&pmx_driver);
if (ret) if (ret)
printk(KERN_ERR "padmux: registration failed. err no: %d\n", pr_err("padmux: registration failed. err no: %d\n", ret);
ret);
} }

2
arch/arm/mach-spear3xx/spear3xx.c
View File

@ -11,6 +11,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#define pr_fmt(fmt) "SPEAr3xx: " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/amba/pl061.h> #include <linux/amba/pl061.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>