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 095/196] kset: remove decl_subsys macro
    Date
    This macro is no longer used.  ksets should be created dynamically with
    a call to kset_create_and_add() not declared statically.

    Yes, there are 5 remaining static struct kset usages in the kernel tree,
    but they will be fixed up soon.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/base/class.c | 11 +++++++++--
    include/linux/kobject.h | 6 ------
    2 files changed, 9 insertions(+), 8 deletions(-)

    diff --git a/drivers/base/class.c b/drivers/base/class.c
    index d8a92c6..304f90e 100644
    --- a/drivers/base/class.c
    +++ b/drivers/base/class.c
    @@ -453,8 +453,15 @@ static struct kset_uevent_ops class_uevent_ops = {
    .uevent = class_uevent,
    };

    -static decl_subsys(class_obj, &class_uevent_ops);
    -
    +/*
    + * DO NOT copy how this is created, kset_create_and_add() should be
    + * called, but this is a hold-over from the old-way and will be deleted
    + * entirely soon.
    + */
    +static struct kset class_obj_subsys = {
    + .kobj = { .k_name = "class_obj", },
    + .uevent_ops = &class_uevent_ops,
    +};

    static int class_device_add_attrs(struct class_device * cd)
    {
    diff --git a/include/linux/kobject.h b/include/linux/kobject.h
    index 673623f..9da3523 100644
    --- a/include/linux/kobject.h
    +++ b/include/linux/kobject.h
    @@ -198,12 +198,6 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
    #define set_kset_name(str) .kset = { .kobj = { .k_name = str } }


    -#define decl_subsys(_name,_uevent_ops) \
    -struct kset _name##_subsys = { \
    - .kobj = { .k_name = __stringify(_name) }, \
    - .uevent_ops =_uevent_ops, \
    -}
    -
    /* The global /sys/kernel/ kset for people to chain off of */
    extern struct kset *kernel_kset;
    /* The global /sys/hypervisor/ kobject for people to chain off of */
    --
    1.5.3.8


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