From 0169256e4bbf29e507cdd1df5812c093d610f1d5 Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Tue, 26 Jul 2011 16:08:57 -0700 Subject: ramoops: add new line to each print MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new line to each print. Signed-off-by: Marco Stornelli Reported-by: Stevie Trujillo Cc: Kyungmin Park Cc: Américo Wang Cc: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/ramoops.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c index 32aa233df300..c9e1028766a4 100644 --- a/drivers/char/ramoops.c +++ b/drivers/char/ramoops.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -111,14 +113,14 @@ static int __init ramoops_probe(struct platform_device *pdev) int err = -EINVAL; if (!pdata->mem_size) { - printk(KERN_ERR "ramoops: invalid size specification"); + pr_err("invalid size specification\n"); goto fail3; } rounddown_pow_of_two(pdata->mem_size); if (pdata->mem_size < RECORD_SIZE) { - printk(KERN_ERR "ramoops: size too small"); + pr_err("size too small\n"); goto fail3; } @@ -128,21 +130,21 @@ static int __init ramoops_probe(struct platform_device *pdev) cxt->phys_addr = pdata->mem_address; if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) { - printk(KERN_ERR "ramoops: request mem region failed"); + pr_err("request mem region failed\n"); err = -EINVAL; goto fail3; } cxt->virt_addr = ioremap(cxt->phys_addr, cxt->size); if (!cxt->virt_addr) { - printk(KERN_ERR "ramoops: ioremap failed"); + pr_err("ioremap failed\n"); goto fail2; } cxt->dump.dump = ramoops_do_dump; err = kmsg_dump_register(&cxt->dump); if (err) { - printk(KERN_ERR "ramoops: registering kmsg dumper failed"); + pr_err("registering kmsg dumper failed\n"); goto fail1; } @@ -161,7 +163,7 @@ static int __exit ramoops_remove(struct platform_device *pdev) struct ramoops_context *cxt = &oops_cxt; if (kmsg_dump_unregister(&cxt->dump) < 0) - printk(KERN_WARNING "ramoops: could not unregister kmsg_dumper"); + pr_warn("could not unregister kmsg_dumper\n"); iounmap(cxt->virt_addr); release_mem_region(cxt->phys_addr, cxt->size); @@ -185,6 +187,7 @@ static int __init ramoops_init(void) * If we didn't find a platform device, we use module parameters * building platform data on the fly. */ + pr_info("platform device not found, using module parameters\n"); dummy_data = kzalloc(sizeof(struct ramoops_platform_data), GFP_KERNEL); if (!dummy_data) -- cgit v1.2.3