lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 162/196] Kobject: convert kernel/module.c to use kobject_init/add_ng()
    Date
    This converts the code to use the new kobject functions, cleaning up the
    logic in doing so.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    kernel/module.c | 14 ++++++--------
    1 files changed, 6 insertions(+), 8 deletions(-)

    diff --git a/kernel/module.c b/kernel/module.c
    index 0ae8117..89cd4c7 100644
    --- a/kernel/module.c
    +++ b/kernel/module.c
    @@ -1217,18 +1217,16 @@ int mod_sysfs_init(struct module *mod)
    err = -EINVAL;
    goto out;
    }
    - memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
    - err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
    - if (err)
    - goto out;
    - mod->mkobj.kobj.kset = module_kset;
    - mod->mkobj.kobj.ktype = &module_ktype;
    mod->mkobj.mod = mod;

    - kobject_init(&mod->mkobj.kobj);
    + memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
    + mod->mkobj.kobj.kset = module_kset;
    + err = kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL,
    + "%s", mod->name);
    + if (err)
    + kobject_put(&mod->mkobj.kobj);

    /* delay uevent until full sysfs population */
    - err = kobject_add(&mod->mkobj.kobj);
    out:
    return err;
    }
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 09:33    [W:3.452 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site