summaryrefslogtreecommitdiffstats
path: root/drivers/base/class.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-03 00:19:59 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-25 05:40:24 +0100
commit5c03c7ab886859eb195440dbb6ccb8c30c4e84cc (patch)
tree16274460957bd2c6c80bb5708ba344bea20d4315 /drivers/base/class.c
parentkset: convert block_subsys to use kset_create (diff)
downloadlinux-5c03c7ab886859eb195440dbb6ccb8c30c4e84cc.tar.xz
linux-5c03c7ab886859eb195440dbb6ccb8c30c4e84cc.zip
kset: remove decl_subsys macro
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>
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r--drivers/base/class.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index d8a92c650b43..304f90eb9b00 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)
{