Skip to contentSkip to conversation

ramoops: add new line to printks

PATCH Superseded Marco Stornelli 3 participants 8 messages May 28, 2011 – Jun 8, 2011 Char and misc drivers

lore
Share & tools
lore

Marco Stornelli

author
#0 lore raw

PATCH 2/2 ramoops: add new line to printks

From: Marco Stornelli <[email protected]>

Add new line to each printk.

Signed-off-by Marco Stornelli <[email protected]>

---

drivers/char/ramoops.c +6 -6
index bf5f9f6..6662c1b 100644
@@ -111,14 +111,14 @@ static int __init ramoops_probe(struct platform_device *pdev)
 	int err = -EINVAL;
 
 	if (!pdata->mem_size) {
-		printk(KERN_ERR "ramoops: invalid size specification");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: size too small\n");
 		goto fail3;
 	}
 

@@ -128,21 +128,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");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: registering kmsg dumper failed\n");
 		goto fail1;
 	}
 

@@ -161,7 +161,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");
+		printk(KERN_WARNING "ramoops: could not unregister kmsg_dumper\n");
 
 	iounmap(cxt->virt_addr);
 	release_mem_region(cxt->phys_addr, cxt->size);
author
#1 lore raw

PATCH 2/2 ramoops: add new line to printks

From: Marco Stornelli <[email protected]>

Add new line to each printk.

Signed-off-by Marco Stornelli <[email protected]>
CC Kyungmin Park <[email protected]>
CC Américo Wang <[email protected]>
Reported-by Stevie Trujillo <[email protected]>

---

drivers/char/ramoops.c +6 -6
index df092e1..20e9d3e 100644
@@ -111,14 +111,14 @@ static int __init ramoops_probe(struct platform_device *pdev)
 	int err = -EINVAL;
 
 	if (!pdata->mem_size) {
-		printk(KERN_ERR "ramoops: invalid size specification");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: size too small\n");
 		goto fail3;
 	}
 

@@ -128,21 +128,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");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: 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");
+		printk(KERN_ERR "ramoops: registering kmsg dumper failed\n");
 		goto fail1;
 	}
 

@@ -161,7 +161,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");
+		printk(KERN_WARNING "ramoops: could not unregister kmsg_dumper\n");
 
 	iounmap(cxt->virt_addr);
 	release_mem_region(cxt->phys_addr, cxt->size);
#3 lore raw
In reply to Marco Stornelli
Quoted 2 lines · Marco Stornelli

From: Marco Stornelli <[email protected]>
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(-)
drivers/char/ramoops.c +8 -6
index 1a9f5f6..1283180 100644
@@ -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);
author
#4 lore raw

PATCH v2 2/2 ramoops: add new line to each print

From: Marco Stornelli <[email protected]>

Add new line to each print.

Signed-off-by Marco Stornelli <[email protected]>
CC Kyungmin Park <[email protected]>
CC Américo Wang <[email protected]>
CC Joe Perches <[email protected]>
Reported-by Stevie Trujillo <[email protected]>

---
ChangeLog:
- v2: used pr_<level> instead of printk

drivers/char/ramoops.c +10 -6
index df092e1..c3bf9b5 100644
@@ -19,6 +19,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/kmsg_dump.h>

@@ -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);

@@ -186,6 +188,8 @@ 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)
#5 lore raw

Re: [PATCH 2/2 v2] ramoops: add new line to each print

drivers/char/ramoops.c

Quoted 3 lines · Marco Stornelli

From: Marco Stornelli <[email protected]>
Add new line to each print.

drivers/char/ramoops.c +0 -0

[]

drivers/char/ramoops.c static int __init ramoops_init(void) · line 192

Quoted 6 lines
drivers/char/ramoops.c +2 -0
@@ -186,6 +188,8 @@ 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");

Thanks Marco, I think that looks better.

Trivia:

This fits on a single line and it's not generally a good thing to split a format across multiple lines.

cheers, Joe

author
#6 lore raw

Re: [PATCH 2/2 v2] ramoops: add new line to each print

Il 08/06/2011 21:27, Joe Perches ha scritto:

Quoted 14 lines · Marco Stornelli

drivers/char/ramoops.c

Quoted 3 lines

From: Marco Stornelli<[email protected]>
Add new line to each print.

drivers/char/ramoops.c +0 -0

[]

drivers/char/ramoops.c static int __init ramoops_init(void) · line 192

Quoted 6 lines
drivers/char/ramoops.c +2 -0
@@ -186,6 +188,8 @@ 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");

Thanks Marco, I think that looks better.

Quoted 6 lines

Trivia:

This fits on a single line and it's not generally a good thing to split a format across multiple lines.

cheers, Joe

Mmmm...my editor said 81 cols, so I split the message into two lines. I'll check it again.

Marco

author
#7 lore raw

PATCH v3 2/2 ramoops: add new line to each print

In reply to Marco Stornelli

From: Marco Stornelli <[email protected]>

Add new line to each print.

Signed-off-by Marco Stornelli <[email protected]>
CC Kyungmin Park <[email protected]>
CC Américo Wang <[email protected]>
CC Joe Perches <[email protected]>
Reported-by Stevie Trujillo <[email protected]>

---
ChangeLog:
- v3: removed double line from pr_info
- v2: used pr_<level> instead of printk
- v1: initial draft

drivers/char/ramoops.c +9 -6
index df092e1..5b4a5e1 100644
@@ -19,6 +19,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/kmsg_dump.h>

@@ -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);

@@ -186,6 +188,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)