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, 2 insertions, 4 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 9f8d599459d1..3f914725bda8 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -285,8 +285,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
         int len;
 
         if (env->envp_idx >= ARRAY_SIZE(env->envp)) {
-                printk(KERN_ERR "add_uevent_var: too many keys\n");
-                WARN_ON(1);
+                WARN(1, KERN_ERR "add_uevent_var: too many keys\n");
                 return -ENOMEM;
         }
 
@@ -297,8 +296,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
         va_end(args);
 
         if (len >= (sizeof(env->buf) - env->buflen)) {
-                printk(KERN_ERR "add_uevent_var: buffer size too small\n");
-                WARN_ON(1);
+                WARN(1, KERN_ERR "add_uevent_var: buffer size too small\n");
                 return -ENOMEM;
         }