diff options
Diffstat (limited to 'arch/arm/mach-spear3xx/spear320.c')
-rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 11 |
1 files changed, 6 insertions, 5 deletions
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 | } |