Skip to content

Commit

Permalink
kset: remove decl_subsys macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent 830d3cf commit 5c03c7a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
11 changes: 9 additions & 2 deletions drivers/base/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
6 changes: 0 additions & 6 deletions include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 5c03c7a

Please sign in to comment.