diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-28 11:26:42 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-11-21 15:24:50 +0000 |
| commit | 4ed89f2228061422ce5f62545fd0b6f6648bd2cc (patch) | |
| tree | 0f37768acf995006a4299d80122a3f924e5c5763 /arch/arm/kernel/atags_parse.c | |
| parent | c2459d35f5b8de077fde859b8c96a23f309b9ab2 (diff) | |
| download | linux-4ed89f2228061422ce5f62545fd0b6f6648bd2cc.tar.bz2 | |
ARM: convert printk(KERN_* to pr_*
Convert many (but not all) printk(KERN_* to pr_* to simplify the code.
We take the opportunity to join some printk lines together so we don't
split the message across several lines, and we also add a few levels
to some messages which were previously missing them.
Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/atags_parse.c')
| -rw-r--r-- | arch/arm/kernel/atags_parse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 528f8af2addb..68c6ae0b9e4c 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -167,8 +167,7 @@ static void __init parse_tags(const struct tag *t) { for (; t->hdr.size; t = tag_next(t)) if (!parse_tag(t)) - printk(KERN_WARNING - "Ignoring unrecognised tag 0x%08x\n", + pr_warn("Ignoring unrecognised tag 0x%08x\n", t->hdr.tag); } @@ -193,7 +192,7 @@ setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) */ for_each_machine_desc(p) if (machine_nr == p->nr) { - printk("Machine: %s\n", p->name); + pr_info("Machine: %s\n", p->name); mdesc = p; break; } |