2 files changed, 8 insertions, 6 deletions

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6942e065e609..fc567fad3f7c 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -631,7 +631,7 @@ static struct kobj_type edd_ktype = {
         .default_attrs  = def_attrs,
 };
 
-static decl_subsys(edd, &edd_ktype, NULL);
+static decl_subsys(edd, NULL);
 
 
 /**
@@ -723,7 +723,8 @@ edd_device_register(struct edd_device *edev, int i)
         edd_dev_set_info(edev, i);
         kobject_set_name(&edev->kobj, "int13_dev%02x",
                          0x80 + i);
-        kobj_set_kset_s(edev,edd_subsys);
+        edev->kobj.kset = &edd_subsys;
+        edev->kobj.ktype = &edd_ktype;
         error = kobject_register(&edev->kobj);
         if (!error)
                 edd_populate_dir(edev);
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);