diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-12-06 11:02:53 -0500 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-02-12 04:36:50 -0500 |
| commit | 0269be792f3330efd5f987cf29be37bb91322e35 (patch) | |
| tree | 7a98b2f480e1079fff9e92d5bca418ac73ce6aa5 | |
| parent | ed1aded433ee70123c761fbeddc409e3ed2ffcbf (diff) | |
m68k/bvme6000: Modernize printing of kernel messages
Convert from printk() to pr_*().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/bvme6000/config.c | 8 | ||||
| -rw-r--r-- | arch/m68k/bvme6000/rtc.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 611d4d9ea2bd..2cfff4765040 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c | |||
| @@ -63,8 +63,8 @@ void bvme6000_reset(void) | |||
| 63 | { | 63 | { |
| 64 | volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE; | 64 | volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE; |
| 65 | 65 | ||
| 66 | printk ("\r\n\nCalled bvme6000_reset\r\n" | 66 | pr_info("\r\n\nCalled bvme6000_reset\r\n" |
| 67 | "\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r"); | 67 | "\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r"); |
| 68 | /* The string of returns is to delay the reset until the whole | 68 | /* The string of returns is to delay the reset until the whole |
| 69 | * message is output. */ | 69 | * message is output. */ |
| 70 | /* Enable the watchdog, via PIT port C bit 4 */ | 70 | /* Enable the watchdog, via PIT port C bit 4 */ |
| @@ -117,8 +117,8 @@ void __init config_bvme6000(void) | |||
| 117 | mach_reset = bvme6000_reset; | 117 | mach_reset = bvme6000_reset; |
| 118 | mach_get_model = bvme6000_get_model; | 118 | mach_get_model = bvme6000_get_model; |
| 119 | 119 | ||
| 120 | printk ("Board is %sconfigured as a System Controller\n", | 120 | pr_info("Board is %sconfigured as a System Controller\n", |
| 121 | *config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not "); | 121 | *config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not "); |
| 122 | 122 | ||
| 123 | /* Now do the PIT configuration */ | 123 | /* Now do the PIT configuration */ |
| 124 | 124 | ||
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index d53c9b301f84..e4f1faffe32b 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c | |||
| @@ -168,7 +168,7 @@ static int __init rtc_DP8570A_init(void) | |||
| 168 | if (!MACH_IS_BVME6000) | 168 | if (!MACH_IS_BVME6000) |
| 169 | return -ENODEV; | 169 | return -ENODEV; |
| 170 | 170 | ||
| 171 | printk(KERN_INFO "DP8570A Real Time Clock Driver v%s\n", RTC_VERSION); | 171 | pr_info("DP8570A Real Time Clock Driver v%s\n", RTC_VERSION); |
| 172 | return misc_register(&rtc_dev); | 172 | return misc_register(&rtc_dev); |
| 173 | } | 173 | } |
| 174 | module_init(rtc_DP8570A_init); | 174 | module_init(rtc_DP8570A_init); |
