Re: [PATCH 2/2] ramoops: add new line to printks

From: Joe Perches
Date: Wed Jun 08 2011 - 12:22:49 EST


On Tue, 2011-06-07 at 18:52 +0200, Marco Stornelli wrote:
> From: Marco Stornelli <marco.stornelli@xxxxxxxxx>
> Add new line to each printk.

Perhaps use pr_<level> and pr_fmt instead?
---
drivers/char/ramoops.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index 1a9f5f6..1283180 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -19,6 +19,8 @@
*
*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kmsg_dump.h>
@@ -112,14 +114,14 @@ static int __init ramoops_probe(struct platform_device *pdev)
}

if (!mem_size) {
- printk(KERN_ERR "ramoops: invalid size specification");
+ pr_err("invalid size specification\n");
goto fail3;
}

rounddown_pow_of_two(mem_size);

if (mem_size < RECORD_SIZE) {
- printk(KERN_ERR "ramoops: size too small");
+ pr_err("size too small\n");
goto fail3;
}

@@ -129,21 +131,21 @@ static int __init ramoops_probe(struct platform_device *pdev)
cxt->phys_addr = 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;
}

@@ -162,7 +164,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);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/