luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kset: remove decl_subsys macro

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2007-11-02 16:19:59 -07:00
parent 830d3cfb16
commit 5c03c7ab88
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/class.c
View File

@ -453,8 +453,15 @@ static struct kset_uevent_ops class_uevent_ops = {
.uevent = class_uevent, .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) static int class_device_add_attrs(struct class_device * cd)
{ {

6
include/linux/kobject.h
View File

@ -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 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 */ /* The global /sys/kernel/ kset for people to chain off of */
extern struct kset *kernel_kset; extern struct kset *kernel_kset;
/* The global /sys/hypervisor/ kobject for people to chain off of */ /* The global /sys/hypervisor/ kobject for people to chain off of */