lkml.org 
[lkml]   [2008]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 3/17] Introduce WARN() usage in the kobject code
    From: Arjan van de Ven <arjan@linux.intel.com>

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

    lib/kobject.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    Index: linux.trees.git/lib/kobject.c
    ===================================================================
    --- linux.trees.git.orig/lib/kobject.c
    +++ linux.trees.git/lib/kobject.c
    @@ -215,9 +215,8 @@ static int kobject_add_internal(struct k
    return -ENOENT;

    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);
    - WARN_ON(1);
    return -EINVAL;
    }

    @@ -627,12 +626,10 @@ static void kobject_release(struct kref
    void kobject_put(struct kobject *kobj)
    {
    if (kobj) {
    - if (!kobj->state_initialized) {
    - printk(KERN_WARNING "kobject: '%s' (%p): is not "
    + if (!kobj->state_initialized)
    + WARN(1, KERN_WARNING "kobject: '%s' (%p): is not "
    "initialized, yet kobject_put() is being "
    "called.\n", kobject_name(kobj), kobj);
    - WARN_ON(1);
    - }
    kref_put(&kobj->kref, kobject_release);
    }
    }

    \
     
     \ /
      Last update: 2008-07-08 19:05    [W:4.325 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site