kobject: remove struct kobj_type from struct kset

We don't need a "default" ktype for a kset.  We should set this
explicitly every time for each kset.  This change is needed so that we
can make ksets dynamic, and cleans up one of the odd, undocumented
assumption that the kset/kobject/ktype model has.

This patch is based on a lot of help from Kay Sievers.

Nasty bug in the block code was found by Dave Young
<hidave.darkstar@gmail.com>

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 858a7b95933b..06ecdb9f6013 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -583,8 +583,8 @@ static struct subsys_attribute *efi_subsys_attrs[] = {
         NULL,   /* maybe more in the future? */
 };
 
-static decl_subsys(vars, &efivar_ktype, NULL);
-static decl_subsys(efi, NULL, NULL);
+static decl_subsys(vars, NULL);
+static decl_subsys(efi, NULL);
 
 /*
  * efivar_create_sysfs_entry()
@@ -629,7 +629,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
 
         kobject_set_name(&new_efivar->kobj, "%s", short_name);
-        kobj_set_kset_s(new_efivar, vars_subsys);
+        new_efivar->kobj.kset = &vars_subsys;
+        new_efivar->kobj.ktype = &efivar_ktype;
         i = kobject_register(&new_efivar->kobj);
         if (i) {
                 kfree(short_name);
@@ -687,7 +688,7 @@ efivars_init(void)
                 goto out_free;
         }
 
-        kobj_set_kset_s(&vars_subsys, efi_subsys);
+        vars_subsys.kobj.kset = &efi_subsys;
 
         error = subsystem_register(&vars_subsys);