GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 06:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use WARN() in lib/

Browse source 
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:
Arjan van de Ven 2008-07-25 19:45:39 -07:00 • committed by Linus Torvalds
parent f810a5cf28
commit 5cd2b459d3
4 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/debugobjects.c
View file

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