diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2017-10-26 22:45:24 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-11-09 23:02:56 +0100 |
| commit | 0e37a23ebdadc0e34176b816770da6f4ac64043e (patch) | |
| tree | 28b0f7b0c8957d3f1b7c6df7ec1a9f86d30f5bfc /arch/m68k/mac/via.c | |
| parent | 0b07194bb55ed836c2cc7c22e866b87a14681984 (diff) | |
| download | op-kernel-dev-0e37a23ebdadc0e34176b816770da6f4ac64043e.zip op-kernel-dev-0e37a23ebdadc0e34176b816770da6f4ac64043e.tar.gz | |
m68k/mac: More printk modernization
Log message fragments used to be printed on one line but now get split up.
Fix this. Also, suppress log spam that merely prints known pointer values.
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/via.c')
| -rw-r--r-- | arch/m68k/mac/via.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 16629e9..05021381 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c @@ -121,18 +121,21 @@ void via_debug_dump(void); void __init via_init(void) { + via1 = (void *)VIA1_BASE; + pr_debug("VIA1 detected at %p\n", via1); + switch(macintosh_config->via_type) { /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ case MAC_VIA_IICI: - via1 = (void *) VIA1_BASE; if (macintosh_config->ident == MAC_MODEL_IIFX) { via2 = NULL; rbv_present = 0; oss_present = 1; } else { via2 = (void *) RBV_BASE; + pr_debug("VIA2 (RBV) detected at %p\n", via2); rbv_present = 1; oss_present = 0; } @@ -154,8 +157,8 @@ void __init via_init(void) case MAC_VIA_QUADRA: case MAC_VIA_II: - via1 = (void *) VIA1_BASE; via2 = (void *) VIA2_BASE; + pr_debug("VIA2 detected at %p\n", via2); rbv_present = 0; oss_present = 0; rbv_clear = 0x00; @@ -168,17 +171,6 @@ void __init via_init(void) panic("UNKNOWN VIA TYPE"); } - printk(KERN_INFO "VIA1 at %p is a 6522 or clone\n", via1); - - printk(KERN_INFO "VIA2 at %p is ", via2); - if (rbv_present) { - printk("an RBV\n"); - } else if (oss_present) { - printk("an OSS\n"); - } else { - printk("a 6522 or clone\n"); - } - #ifdef DEBUG_VIA via_debug_dump(); #endif |
