[PATCH 41/54] kset: convert efivars to use kset_create for the efi subsystem.

Greg Kroah-Hartman
2007-11-03T00:13:49Z

Dynamically create the kset instead of declaring it statically.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Cc: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/firmware/efivars.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 8d7c8c5..c2383ac 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -444,7 +444,7 @@ static struct attribute_group efi_subsys_attr_group = {

static decl_subsys(vars, NULL);
-static decl_subsys(efi, NULL);
+static struct kset *efi_kset;

/*
* efivar_create_sysfs_entry()
@@ -539,15 +539,14 @@ efivars_init(void)
/*
* For now we'll register the efi subsys within this driver
*/
-
- error = firmware_register(&efi_subsys);
-
- if (error) {
+ efi_kset = kset_create_and_register("efi", NULL, NULL, firmware_kset);
+ if (IS_ERR(efi_kset)) {
+ error = PTR_ERR(efi_kset);
printk(KERN_ERR "efivars: Firmware registration failed with error %d.\n", error);
goto out_free;
}

- vars_subsys.kobj.kset = &efi_subsys;
+ vars_subsys.kobj.kset = efi_kset;

error = subsystem_register(&vars_subsys);

@@ -584,7 +583,7 @@ efivars_init(void)
} while (status != EFI_NOT_FOUND);

/* Don't forget the systab entry */
- error = sysfs_create_group(&efi_subsys.kobj, &efi_subsys_attr_group);
+ error = sysfs_create_group(&efi_kset->kobj, &efi_subsys_attr_group);
if (error)
printk(KERN_ERR "efivars: Sysfs attribute export failed with error %d.\n", error);
else
@@ -593,7 +592,7 @@ efivars_init(void)
subsystem_unregister(&vars_subsys);

out_firmware_unregister:
- firmware_unregister(&efi_subsys);
+ kset_unregister(efi_kset);

out_free:
kfree(variable_name);
@@ -614,7 +613,7 @@ efivars_exit(void)
}

subsystem_unregister(&vars_subsys);
- firmware_unregister(&efi_subsys);
+ kset_unregister(efi_kset);
}

module_init(efivars_init);
--
1.5.3.4