[PATCH V2 1/3] lib/debugobjects.c: convert printk to pr_foo()

[PATCH V2 1/3] lib/debugobjects.c: convert printk to pr_foo()

[Fabian Frederick]

Convert all printk to pr_foo() except KERN_DEBUG
(see Documentation/CodingStyle Chapter 13)

Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 lib/debugobjects.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index e0731c3..ea4c737 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -218,7 +218,7 @@ static void debug_objects_oom(void)
 	unsigned long flags;
 	int i;
 
-	printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n");
+	pr_warn("ODEBUG: Out of memory. ODEBUG disabled\n");
 
 	for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) {
 		raw_spin_lock_irqsave(&db->lock, flags);
@@ -292,11 +292,9 @@ static void debug_object_is_on_stack(void *addr, int onstack)
 
 	limit++;
 	if (is_on_stack)
-		printk(KERN_WARNING
-		       "ODEBUG: object is on stack, but not annotated\n");
+		pr_warn("ODEBUG: object is on stack, but not annotated\n");
 	else
-		printk(KERN_WARNING
-		       "ODEBUG: object is not on stack, but annotated\n");
+		pr_warn("ODEBUG: object is not on stack, but annotated\n");
 	WARN_ON(1);
 }
 
@@ -985,7 +983,7 @@ static void __init debug_objects_selftest(void)
 	if (check_results(&obj, ODEBUG_STATE_NONE, ++fixups, ++warnings))
 		goto out;
 #endif
-	printk(KERN_INFO "ODEBUG: selftest passed\n");
+	pr_info("ODEBUG: selftest passed\n");
 
 out:
 	debug_objects_fixups = oldfixups;
@@ -1090,7 +1088,7 @@ void __init debug_objects_mem_init(void)
 		debug_objects_enabled = 0;
 		if (obj_cache)
 			kmem_cache_destroy(obj_cache);
-		printk(KERN_WARNING "ODEBUG: out of memory.\n");
+		pr_warn("ODEBUG: out of memory.\n");
 	} else
 		debug_objects_selftest();
 }
-- 
1.9.1

Re: [PATCH V2 1/3] lib/debugobjects.c: convert printk to pr_foo()

[Josh Triplett]

On Thu, May 29, 2014 at 09:22:58AM +0200, Fabian Frederick wrote:
> Convert all printk to pr_foo() except KERN_DEBUG
> (see Documentation/CodingStyle Chapter 13)
> 
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  lib/debugobjects.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/debugobjects.c b/lib/debugobjects.c
> index e0731c3..ea4c737 100644
> --- a/lib/debugobjects.c
> +++ b/lib/debugobjects.c
> @@ -218,7 +218,7 @@ static void debug_objects_oom(void)
>  	unsigned long flags;
>  	int i;
>  
> -	printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n");
> +	pr_warn("ODEBUG: Out of memory. ODEBUG disabled\n");
>  
>  	for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) {
>  		raw_spin_lock_irqsave(&db->lock, flags);
> @@ -292,11 +292,9 @@ static void debug_object_is_on_stack(void *addr, int onstack)
>  
>  	limit++;
>  	if (is_on_stack)
> -		printk(KERN_WARNING
> -		       "ODEBUG: object is on stack, but not annotated\n");
> +		pr_warn("ODEBUG: object is on stack, but not annotated\n");
>  	else
> -		printk(KERN_WARNING
> -		       "ODEBUG: object is not on stack, but annotated\n");
> +		pr_warn("ODEBUG: object is not on stack, but annotated\n");
>  	WARN_ON(1);
>  }
>  
> @@ -985,7 +983,7 @@ static void __init debug_objects_selftest(void)
>  	if (check_results(&obj, ODEBUG_STATE_NONE, ++fixups, ++warnings))
>  		goto out;
>  #endif
> -	printk(KERN_INFO "ODEBUG: selftest passed\n");
> +	pr_info("ODEBUG: selftest passed\n");
>  
>  out:
>  	debug_objects_fixups = oldfixups;
> @@ -1090,7 +1088,7 @@ void __init debug_objects_mem_init(void)
>  		debug_objects_enabled = 0;
>  		if (obj_cache)
>  			kmem_cache_destroy(obj_cache);
> -		printk(KERN_WARNING "ODEBUG: out of memory.\n");
> +		pr_warn("ODEBUG: out of memory.\n");
>  	} else
>  		debug_objects_selftest();
>  }
> -- 
> 1.9.1