Use WARN() in lib/

Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes
part of the warning section for better reporting/collection.  In addition, one
of the if() clauses collapes into the WARN() entirely now.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 10 deletions

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index f86196390cfd..45a6bde762d1 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -205,9 +205,8 @@ static void debug_print_object(struct debug_obj *obj, char *msg)
 
         if (limit < 5 && obj->descr != descr_test) {
                 limit++;
-                printk(KERN_ERR "ODEBUG: %s %s object type: %s\n", msg,
+                WARN(1, KERN_ERR "ODEBUG: %s %s object type: %s\n", msg,
                        obj_states[obj->state], obj->descr->name);
-                WARN_ON(1);
         }
         debug_objects_warnings++;
 }
@@ -733,26 +732,22 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
 
         obj = lookup_object(addr, db);
         if (!obj && state != ODEBUG_STATE_NONE) {
-                printk(KERN_ERR "ODEBUG: selftest object not found\n");
-                WARN_ON(1);
+                WARN(1, KERN_ERR "ODEBUG: selftest object not found\n");
                 goto out;
         }
         if (obj && obj->state != state) {
-                printk(KERN_ERR "ODEBUG: selftest wrong state: %d != %d\n",
+                WARN(1, KERN_ERR "ODEBUG: selftest wrong state: %d != %d\n",
                        obj->state, state);
-                WARN_ON(1);
                 goto out;
         }
         if (fixups != debug_objects_fixups) {
-                printk(KERN_ERR "ODEBUG: selftest fixups failed %d != %d\n",
+                WARN(1, KERN_ERR "ODEBUG: selftest fixups failed %d != %d\n",
                        fixups, debug_objects_fixups);
-                WARN_ON(1);
                 goto out;
         }
         if (warnings != debug_objects_warnings) {
-                printk(KERN_ERR "ODEBUG: selftest warnings failed %d != %d\n",
+                WARN(1, KERN_ERR "ODEBUG: selftest warnings failed %d != %d\n",
                        warnings, debug_objects_warnings);
-                WARN_ON(1);
                 goto out;
         }
         res = 0;