diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-05-10 06:42:43 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-05-28 04:11:55 -0400 |
commit | e8d6dc5ad26eb027c19cfb44825f038734be2cb3 (patch) | |
tree | 9bb8f35212d0a6438e68a312c2a659f2e42d31cf /arch/m68k | |
parent | ce00aa0a72ebc10270aa093a866f3c181623fd58 (diff) |
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) | |||
87 | /* serial port address: ignored here */ | 87 | /* serial port address: ignored here */ |
88 | break; | 88 | break; |
89 | 89 | ||
90 | default: | 90 | default: |
91 | unknown = 1; | 91 | unknown = 1; |
92 | } | 92 | } |
93 | 93 | ||
@@ -262,11 +262,12 @@ void __init config_hp300(void) | |||
262 | #endif | 262 | #endif |
263 | mach_max_dma_address = 0xffffffff; | 263 | mach_max_dma_address = 0xffffffff; |
264 | 264 | ||
265 | if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) { | 265 | if (hp300_model >= HP_330 && hp300_model <= HP_433S && |
266 | printk(KERN_INFO "Detected HP9000 model %s\n", hp300_models[hp300_model-HP_320]); | 266 | hp300_model != HP_350) { |
267 | pr_info("Detected HP9000 model %s\n", | ||
268 | hp300_models[hp300_model-HP_320]); | ||
267 | strcat(hp300_model_name, hp300_models[hp300_model-HP_320]); | 269 | strcat(hp300_model_name, hp300_models[hp300_model-HP_320]); |
268 | } | 270 | } else { |
269 | else { | ||
270 | panic("Unknown HP9000 Model"); | 271 | panic("Unknown HP9000 Model"); |
271 | } | 272 | } |
272 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 273 | #ifdef CONFIG_SERIAL_8250_CONSOLE |