aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-05-10 06:40:53 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2014-05-28 04:11:55 -0400
commitce00aa0a72ebc10270aa093a866f3c181623fd58 (patch)
tree9a1e89d6cf5d3adcd04865c18e10d6653687a677
parentf296401b04a6eb2af8da5a5d40e937e91617061b (diff)
m68k/apollo: Convert printk to pr_foo()
no level printk converted to pr_info This is untested Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/apollo/config.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 9268c0f96376..6e62d66c396e 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -65,8 +65,8 @@ int __init apollo_parse_bootinfo(const struct bi_record *record)
65 65
66static void __init dn_setup_model(void) 66static void __init dn_setup_model(void)
67{ 67{
68 printk("Apollo hardware found: "); 68 pr_info("Apollo hardware found: [%s]\n",
69 printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]); 69 apollo_models[apollo_model - APOLLO_DN3000]);
70 70
71 switch(apollo_model) { 71 switch(apollo_model) {
72 case APOLLO_UNKNOWN: 72 case APOLLO_UNKNOWN:
@@ -197,8 +197,10 @@ void dn_sched_init(irq_handler_t timer_routine)
197 *(volatile unsigned char *)(pica+1)&=(~8); 197 *(volatile unsigned char *)(pica+1)&=(~8);
198 198
199#if 0 199#if 0
200 printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3)); 200 pr_info("*(0x10803) %02x\n",
201 printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3)); 201 *(volatile unsigned char *)(apollo_timer + 0x3));
202 pr_info("*(0x10803) %02x\n",
203 *(volatile unsigned char *)(apollo_timer + 0x3));
202#endif 204#endif
203 205
204 if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine)) 206 if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine))
@@ -236,12 +238,10 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) {
236 238
237} 239}
238 240
239int dn_dummy_set_clock_mmss(unsigned long nowtime) { 241int dn_dummy_set_clock_mmss(unsigned long nowtime)
240 242{
241 printk("set_clock_mmss\n"); 243 pr_info("set_clock_mmss\n");
242 244 return 0;
243 return 0;
244
245} 245}
246 246
247void dn_dummy_reset(void) { 247void dn_dummy_reset(void) {