Commit-ID: d976f7626627117c211137cd2aaf8c1656e6627d Gitweb: http://git.kernel.org/tip/d976f7626627117c211137cd2aaf8c1656e6627d Author: Jim Cromie <jim.cromie@xxxxxxxxx> AuthorDate: Thu, 26 Jan 2012 15:52:15 -0800 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Wed, 1 Feb 2012 18:37:35 -0800 clocksource: scx200_hrt: use pr_<level> instead of printk Switch from printk to using pr_<level>. Signed-off-by: Jim Cromie <jim.cromie@xxxxxxxxx> [added commit msg & tweaked subject -jstultz] Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- drivers/clocksource/scx200_hrt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c index 27f4d96..e4e4a04 100644 --- a/drivers/clocksource/scx200_hrt.c +++ b/drivers/clocksource/scx200_hrt.c @@ -71,7 +71,7 @@ static int __init init_hrt_clocksource(void) if (!request_region(scx200_cb_base + SCx200_TIMER_OFFSET, SCx200_TIMER_SIZE, "NatSemi SCx200 High-Resolution Timer")) { - printk(KERN_WARNING NAME ": unable to lock timer region\n"); + pr_warn("unable to lock timer region\n"); return -ENODEV; } @@ -88,7 +88,7 @@ static int __init init_hrt_clocksource(void) cs_hrt.mult = clocksource_hz2mult(HRT_FREQ + ppm, cs_hrt.shift); } - printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n", + pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n", mhz27 ? "27":"1", ppm); return clocksource_register(&cs_hrt); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html