mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-18 10:34:24 +08:00
Example use of WARN()
Now that WARN() exists, we can fold some of the printk's into it. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7a2c477069
commit
d955c78ac4
@ -164,9 +164,8 @@ static int kobject_add_internal(struct kobject *kobj)
|
|||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
if (!kobj->name || !kobj->name[0]) {
|
if (!kobj->name || !kobj->name[0]) {
|
||||||
pr_debug("kobject: (%p): attempted to be registered with empty "
|
WARN(1, "kobject: (%p): attempted to be registered with empty "
|
||||||
"name!\n", kobj);
|
"name!\n", kobj);
|
||||||
WARN_ON(1);
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -583,12 +582,10 @@ static void kobject_release(struct kref *kref)
|
|||||||
void kobject_put(struct kobject *kobj)
|
void kobject_put(struct kobject *kobj)
|
||||||
{
|
{
|
||||||
if (kobj) {
|
if (kobj) {
|
||||||
if (!kobj->state_initialized) {
|
if (!kobj->state_initialized)
|
||||||
printk(KERN_WARNING "kobject: '%s' (%p): is not "
|
WARN(1, KERN_WARNING "kobject: '%s' (%p): is not "
|
||||||
"initialized, yet kobject_put() is being "
|
"initialized, yet kobject_put() is being "
|
||||||
"called.\n", kobject_name(kobj), kobj);
|
"called.\n", kobject_name(kobj), kobj);
|
||||||
WARN_ON(1);
|
|
||||||
}
|
|
||||||
kref_put(&kobj->kref, kobject_release);
|
kref_put(&kobj->kref, kobject_release);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user