diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-05-10 12:42:43 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-05-28 10:11:55 +0200 |
| commit | e8d6dc5ad26eb027c19cfb44825f038734be2cb3 (patch) | |
| tree | 9bb8f35212d0a6438e68a312c2a659f2e42d31cf /arch/m68k | |
| parent | ce00aa0a72ebc10270aa093a866f3c181623fd58 (diff) | |
| download | talos-op-linux-e8d6dc5ad26eb027c19cfb44825f038734be2cb3.tar.gz talos-op-linux-e8d6dc5ad26eb027c19cfb44825f038734be2cb3.zip | |
m68k/hp300: Convert printk to pr_foo()
This patch also fixes some checkpatch warnings
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>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/hp300/config.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index 2e5a787ea11b..a9befe65adc4 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c @@ -87,7 +87,7 @@ int __init hp300_parse_bootinfo(const struct bi_record *record) /* serial port address: ignored here */ break; - default: + default: unknown = 1; } @@ -262,11 +262,12 @@ void __init config_hp300(void) #endif mach_max_dma_address = 0xffffffff; - if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) { - printk(KERN_INFO "Detected HP9000 model %s\n", hp300_models[hp300_model-HP_320]); + if (hp300_model >= HP_330 && hp300_model <= HP_433S && + hp300_model != HP_350) { + pr_info("Detected HP9000 model %s\n", + hp300_models[hp300_model-HP_320]); strcat(hp300_model_name, hp300_models[hp300_model-HP_320]); - } - else { + } else { panic("Unknown HP9000 Model"); } #ifdef CONFIG_SERIAL_8250_CONSOLE |
