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>
This commit is contained in:
committed by
Linus Torvalds
parent
f810a5cf28
commit
5cd2b459d3
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user