diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2012-03-26 01:09:43 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 16:41:34 -0400 |
commit | 5fb00f965eeac548015bcd45414cccbe53b13d3f (patch) | |
tree | 2a0d2b9d82a77f3f521c033b5d7bcef0deea2aca /arch | |
parent | a3a4513b692d147d839c7e6d2e3f0d3280a503ce (diff) |
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: Viresh Kumar <viresh.kumar@st.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 2 |
4 files changed, 20 insertions, 14 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index f7db66812abb..adee72bb68ec 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) "SPEAr300: " fmt | ||
15 | |||
14 | #include <linux/types.h> | 16 | #include <linux/types.h> |
15 | #include <linux/amba/pl061.h> | 17 | #include <linux/amba/pl061.h> |
16 | #include <linux/ptrace.h> | 18 | #include <linux/ptrace.h> |
@@ -447,7 +449,7 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
447 | if (shirq_ras1.regs.base) { | 449 | if (shirq_ras1.regs.base) { |
448 | ret = spear_shirq_register(&shirq_ras1); | 450 | ret = spear_shirq_register(&shirq_ras1); |
449 | if (ret) | 451 | if (ret) |
450 | printk(KERN_ERR "Error registering Shared IRQ\n"); | 452 | pr_err("Error registering Shared IRQ\n"); |
451 | } | 453 | } |
452 | 454 | ||
453 | /* pmx initialization */ | 455 | /* pmx initialization */ |
@@ -459,8 +461,8 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
459 | if (pmx_driver.base) { | 461 | if (pmx_driver.base) { |
460 | ret = pmx_register(&pmx_driver); | 462 | ret = pmx_register(&pmx_driver); |
461 | if (ret) | 463 | if (ret) |
462 | printk(KERN_ERR "padmux: registration failed. err no" | 464 | pr_err("padmux: registration failed. err no: %d\n", |
463 | ": %d\n", ret); | 465 | ret); |
464 | /* Free Mapping, device selection already done */ | 466 | /* Free Mapping, device selection already done */ |
465 | iounmap(pmx_driver.base); | 467 | iounmap(pmx_driver.base); |
466 | } | 468 | } |
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index febaa6fcfb6a..b7c28764df92 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) "SPEAr310: " fmt | ||
15 | |||
14 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
15 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
16 | #include <plat/shirq.h> | 18 | #include <plat/shirq.h> |
@@ -274,25 +276,25 @@ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
274 | shirq_ras1.regs.base = base; | 276 | shirq_ras1.regs.base = base; |
275 | ret = spear_shirq_register(&shirq_ras1); | 277 | ret = spear_shirq_register(&shirq_ras1); |
276 | if (ret) | 278 | if (ret) |
277 | printk(KERN_ERR "Error registering Shared IRQ 1\n"); | 279 | pr_err("Error registering Shared IRQ 1\n"); |
278 | 280 | ||
279 | /* shirq 2 */ | 281 | /* shirq 2 */ |
280 | shirq_ras2.regs.base = base; | 282 | shirq_ras2.regs.base = base; |
281 | ret = spear_shirq_register(&shirq_ras2); | 283 | ret = spear_shirq_register(&shirq_ras2); |
282 | if (ret) | 284 | if (ret) |
283 | printk(KERN_ERR "Error registering Shared IRQ 2\n"); | 285 | pr_err("Error registering Shared IRQ 2\n"); |
284 | 286 | ||
285 | /* shirq 3 */ | 287 | /* shirq 3 */ |
286 | shirq_ras3.regs.base = base; | 288 | shirq_ras3.regs.base = base; |
287 | ret = spear_shirq_register(&shirq_ras3); | 289 | ret = spear_shirq_register(&shirq_ras3); |
288 | if (ret) | 290 | if (ret) |
289 | printk(KERN_ERR "Error registering Shared IRQ 3\n"); | 291 | pr_err("Error registering Shared IRQ 3\n"); |
290 | 292 | ||
291 | /* shirq 4 */ | 293 | /* shirq 4 */ |
292 | shirq_intrcomm_ras.regs.base = base; | 294 | shirq_intrcomm_ras.regs.base = base; |
293 | ret = spear_shirq_register(&shirq_intrcomm_ras); | 295 | ret = spear_shirq_register(&shirq_intrcomm_ras); |
294 | if (ret) | 296 | if (ret) |
295 | printk(KERN_ERR "Error registering Shared IRQ 4\n"); | 297 | pr_err("Error registering Shared IRQ 4\n"); |
296 | } | 298 | } |
297 | 299 | ||
298 | /* pmx initialization */ | 300 | /* pmx initialization */ |
@@ -303,6 +305,5 @@ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
303 | 305 | ||
304 | ret = pmx_register(&pmx_driver); | 306 | ret = pmx_register(&pmx_driver); |
305 | if (ret) | 307 | if (ret) |
306 | printk(KERN_ERR "padmux: registration failed. err no: %d\n", | 308 | pr_err("padmux: registration failed. err no: %d\n", ret); |
307 | ret); | ||
308 | } | 309 | } |
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index deaaf199612c..7bd39c0032bd 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) "SPEAr320: " fmt | ||
15 | |||
14 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
15 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
16 | #include <plat/shirq.h> | 18 | #include <plat/shirq.h> |
@@ -527,19 +529,19 @@ void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
527 | shirq_ras1.regs.base = base; | 529 | shirq_ras1.regs.base = base; |
528 | ret = spear_shirq_register(&shirq_ras1); | 530 | ret = spear_shirq_register(&shirq_ras1); |
529 | if (ret) | 531 | if (ret) |
530 | printk(KERN_ERR "Error registering Shared IRQ 1\n"); | 532 | pr_err("Error registering Shared IRQ 1\n"); |
531 | 533 | ||
532 | /* shirq 3 */ | 534 | /* shirq 3 */ |
533 | shirq_ras3.regs.base = base; | 535 | shirq_ras3.regs.base = base; |
534 | ret = spear_shirq_register(&shirq_ras3); | 536 | ret = spear_shirq_register(&shirq_ras3); |
535 | if (ret) | 537 | if (ret) |
536 | printk(KERN_ERR "Error registering Shared IRQ 3\n"); | 538 | pr_err("Error registering Shared IRQ 3\n"); |
537 | 539 | ||
538 | /* shirq 4 */ | 540 | /* shirq 4 */ |
539 | shirq_intrcomm_ras.regs.base = base; | 541 | shirq_intrcomm_ras.regs.base = base; |
540 | ret = spear_shirq_register(&shirq_intrcomm_ras); | 542 | ret = spear_shirq_register(&shirq_intrcomm_ras); |
541 | if (ret) | 543 | if (ret) |
542 | printk(KERN_ERR "Error registering Shared IRQ 4\n"); | 544 | pr_err("Error registering Shared IRQ 4\n"); |
543 | } | 545 | } |
544 | 546 | ||
545 | /* pmx initialization */ | 547 | /* pmx initialization */ |
@@ -550,6 +552,5 @@ void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
550 | 552 | ||
551 | ret = pmx_register(&pmx_driver); | 553 | ret = pmx_register(&pmx_driver); |
552 | if (ret) | 554 | if (ret) |
553 | printk(KERN_ERR "padmux: registration failed. err no: %d\n", | 555 | pr_err("padmux: registration failed. err no: %d\n", ret); |
554 | ret); | ||
555 | } | 556 | } |
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index b1733c37f209..a236925e13b3 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) "SPEAr3xx: " fmt | ||
15 | |||
14 | #include <linux/types.h> | 16 | #include <linux/types.h> |
15 | #include <linux/amba/pl061.h> | 17 | #include <linux/amba/pl061.h> |
16 | #include <linux/ptrace.h> | 18 | #include <linux/ptrace.h> |