2 files changed, 70 insertions, 85 deletions

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6942e065e609..d168223db159 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 struct kset *edd_kset;
 
 
 /**
@@ -693,7 +693,7 @@ edd_create_symlink_to_pcidev(struct edd_device *edev)
 static inline void
 edd_device_unregister(struct edd_device *edev)
 {
-        kobject_unregister(&edev->kobj);
+        kobject_put(&edev->kobj);
 }
 
 static void edd_populate_dir(struct edd_device * edev)
@@ -721,12 +721,13 @@ edd_device_register(struct edd_device *edev, int i)
         if (!edev)
                 return 1;
         edd_dev_set_info(edev, i);
-        kobject_set_name(&edev->kobj, "int13_dev%02x",
-                         0x80 + i);
-        kobj_set_kset_s(edev,edd_subsys);
-        error = kobject_register(&edev->kobj);
-        if (!error)
+        edev->kobj.kset = edd_kset;
+        error = kobject_init_and_add(&edev->kobj, &edd_ktype, NULL,
+                                     "int13_dev%02x", 0x80 + i);
+        if (!error) {
                 edd_populate_dir(edev);
+                kobject_uevent(&edev->kobj, KOBJ_ADD);
+        }
         return error;
 }
 
@@ -755,9 +756,9 @@ edd_init(void)
                 return 1;
         }
 
-        rc = firmware_register(&edd_subsys);
-        if (rc)
-                return rc;
+        edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);
+        if (!edd_kset)
+                return -ENOMEM;
 
         for (i = 0; i < edd_num_devices() && !rc; i++) {
                 edev = kzalloc(sizeof (*edev), GFP_KERNEL);
@@ -773,7 +774,7 @@ edd_init(void)
         }
 
         if (rc)
-                firmware_unregister(&edd_subsys);
+                kset_unregister(edd_kset);
         return rc;
 }
 
@@ -787,7 +788,7 @@ edd_exit(void)
                 if ((edev = edd_devices[i]))
                         edd_device_unregister(edev);
         }
-        firmware_unregister(&edd_subsys);
+        kset_unregister(edd_kset);
 }
 
 late_initcall(edd_init);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 858a7b95933b..f4f709d1370b 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -129,13 +129,6 @@ struct efivar_attribute {
 };
 
 
-#define EFI_ATTR(_name, _mode, _show, _store) \
-struct subsys_attribute efi_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode}, \
-        .show = _show, \
-        .store = _store, \
-};
-
 #define EFIVAR_ATTR(_name, _mode, _show, _store) \
 struct efivar_attribute efivar_attr_##_name = { \
         .attr = {.name = __stringify(_name), .mode = _mode}, \
@@ -143,13 +136,6 @@ struct efivar_attribute efivar_attr_##_name = { \
         .store = _store, \
 };
 
-#define VAR_SUBSYS_ATTR(_name, _mode, _show, _store) \
-struct subsys_attribute var_subsys_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode}, \
-        .show = _show, \
-        .store = _store, \
-};
-
 #define to_efivar_attr(_attr) container_of(_attr, struct efivar_attribute, attr)
 #define to_efivar_entry(obj)  container_of(obj, struct efivar_entry, kobj)
 
@@ -408,21 +394,16 @@ static struct kobj_type efivar_ktype = {
         .default_attrs = def_attrs,
 };
 
-static ssize_t
-dummy(struct kset *kset, char *buf)
-{
-        return -ENODEV;
-}
-
 static inline void
 efivar_unregister(struct efivar_entry *var)
 {
-        kobject_unregister(&var->kobj);
+        kobject_put(&var->kobj);
 }
 
 
-static ssize_t
-efivar_create(struct kset *kset, const char *buf, size_t count)
+static ssize_t efivar_create(struct kobject *kobj,
+                             struct bin_attribute *bin_attr,
+                             char *buf, loff_t pos, size_t count)
 {
         struct efi_variable *new_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -479,8 +460,9 @@ efivar_create(struct kset *kset, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t
-efivar_delete(struct kset *kset, const char *buf, size_t count)
+static ssize_t efivar_delete(struct kobject *kobj,
+                             struct bin_attribute *bin_attr,
+                             char *buf, loff_t pos, size_t count)
 {
         struct efi_variable *del_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -537,25 +519,26 @@ efivar_delete(struct kset *kset, const char *buf, size_t count)
         return count;
 }
 
-static VAR_SUBSYS_ATTR(new_var, 0200, dummy, efivar_create);
-static VAR_SUBSYS_ATTR(del_var, 0200, dummy, efivar_delete);
+static struct bin_attribute var_subsys_attr_new_var = {
+        .attr = {.name = "new_var", .mode = 0200},
+        .write = efivar_create,
+};
 
-static struct subsys_attribute *var_subsys_attrs[] = {
-        &var_subsys_attr_new_var,
-        &var_subsys_attr_del_var,
-        NULL,
+static struct bin_attribute var_subsys_attr_del_var = {
+        .attr = {.name = "del_var", .mode = 0200},
+        .write = efivar_delete,
 };
 
 /*
  * Let's not leave out systab information that snuck into
  * the efivars driver
  */
-static ssize_t
-systab_read(struct kset *kset, char *buf)
+static ssize_t systab_show(struct kobject *kobj,
+                           struct kobj_attribute *attr, char *buf)
 {
         char *str = buf;
 
-        if (!kset || !buf)
+        if (!kobj || !buf)
                 return -EINVAL;
 
         if (efi.mps != EFI_INVALID_TABLE_ADDR)
@@ -576,15 +559,21 @@ systab_read(struct kset *kset, char *buf)
         return str - buf;
 }
 
-static EFI_ATTR(systab, 0400, systab_read, NULL);
+static struct kobj_attribute efi_attr_systab =
+                        __ATTR(systab, 0400, systab_show, NULL);
 
-static struct subsys_attribute *efi_subsys_attrs[] = {
-        &efi_attr_systab,
+static struct attribute *efi_subsys_attrs[] = {
+        &efi_attr_systab.attr,
         NULL,   /* maybe more in the future? */
 };
 
-static decl_subsys(vars, &efivar_ktype, NULL);
-static decl_subsys(efi, NULL, NULL);
+static struct attribute_group efi_subsys_attr_group = {
+        .attrs = efi_subsys_attrs,
+};
+
+
+static struct kset *vars_kset;
+static struct kobject *efi_kobj;
 
 /*
  * efivar_create_sysfs_entry()
@@ -628,15 +617,16 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         *(short_name + strlen(short_name)) = '-';
         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);
-        i = kobject_register(&new_efivar->kobj);
+        new_efivar->kobj.kset = vars_kset;
+        i = kobject_init_and_add(&new_efivar->kobj, &efivar_ktype, NULL,
+                                 "%s", short_name);
         if (i) {
                 kfree(short_name);
                 kfree(new_efivar);
                 return 1;
         }
 
+        kobject_uevent(&new_efivar->kobj, KOBJ_ADD);
         kfree(short_name);
         short_name = NULL;
 
@@ -660,9 +650,8 @@ efivars_init(void)
         efi_status_t status = EFI_NOT_FOUND;
         efi_guid_t vendor_guid;
         efi_char16_t *variable_name;
-        struct subsys_attribute *attr;
         unsigned long variable_name_size = 1024;
-        int i, error = 0;
+        int error = 0;
 
         if (!efi_enabled)
                 return -ENODEV;
@@ -676,23 +665,18 @@ efivars_init(void)
         printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
                EFIVARS_DATE);
 
-        /*
-         * For now we'll register the efi subsys within this driver
-         */
-
-        error = firmware_register(&efi_subsys);
-
-        if (error) {
-                printk(KERN_ERR "efivars: Firmware registration failed with error %d.\n", error);
+        /* For now we'll register the efi directory at /sys/firmware/efi */
+        efi_kobj = kobject_create_and_add("efi", firmware_kobj);
+        if (!efi_kobj) {
+                printk(KERN_ERR "efivars: Firmware registration failed.\n");
+                error = -ENOMEM;
                 goto out_free;
         }
 
-        kobj_set_kset_s(&vars_subsys, efi_subsys);
-
-        error = subsystem_register(&vars_subsys);
-
-        if (error) {
-                printk(KERN_ERR "efivars: Subsystem registration failed with error %d.\n", error);
+        vars_kset = kset_create_and_add("vars", NULL, efi_kobj);
+        if (!vars_kset) {
+                printk(KERN_ERR "efivars: Subsystem registration failed.\n");
+                error = -ENOMEM;
                 goto out_firmware_unregister;
         }
 
@@ -727,28 +711,28 @@ efivars_init(void)
          * Now add attributes to allow creation of new vars
          * and deletion of existing ones...
          */
-
-        for (i = 0; (attr = var_subsys_attrs[i]) && !error; i++) {
-                if (attr->show && attr->store)
-                        error = subsys_create_file(&vars_subsys, attr);
-        }
+        error = sysfs_create_bin_file(&vars_kset->kobj,
+                                      &var_subsys_attr_new_var);
+        if (error)
+                printk(KERN_ERR "efivars: unable to create new_var sysfs file"
+                        " due to error %d\n", error);
+        error = sysfs_create_bin_file(&vars_kset->kobj,
+                                      &var_subsys_attr_del_var);
+        if (error)
+                printk(KERN_ERR "efivars: unable to create del_var sysfs file"
+                        " due to error %d\n", error);
 
         /* Don't forget the systab entry */
-
-        for (i = 0; (attr = efi_subsys_attrs[i]) && !error; i++) {
-                if (attr->show)
-                        error = subsys_create_file(&efi_subsys, attr);
-        }
-
+        error = sysfs_create_group(efi_kobj, &efi_subsys_attr_group);
         if (error)
                 printk(KERN_ERR "efivars: Sysfs attribute export failed with error %d.\n", error);
         else
                 goto out_free;
 
-        subsystem_unregister(&vars_subsys);
+        kset_unregister(vars_kset);
 
 out_firmware_unregister:
-        firmware_unregister(&efi_subsys);
+        kobject_put(efi_kobj);
 
 out_free:
         kfree(variable_name);
@@ -768,8 +752,8 @@ efivars_exit(void)
                 efivar_unregister(entry);
         }
 
-        subsystem_unregister(&vars_subsys);
-        firmware_unregister(&efi_subsys);
+        kset_unregister(vars_kset);
+        kobject_put(efi_kobj);
 }
 
 module_init(efivars_init);