Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

kset: convert efivars to use kset_create for the vars sub-subsystem.

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2007-11-02 13:20:40 -07:00
parent 89a07e34b1
commit 66ac831e03
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/firmware/efivars.c
View File

@ -572,7 +572,7 @@ static struct attribute_group efi_subsys_attr_group = {
}; };
static decl_subsys(vars, NULL); static struct kset *vars_kset;
static struct kset *efi_kset; static struct kset *efi_kset;
/* /*
@ -618,7 +618,7 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
efi_guid_unparse(vendor_guid, short_name + strlen(short_name)); efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
kobject_set_name(&new_efivar->kobj, "%s", short_name); kobject_set_name(&new_efivar->kobj, "%s", short_name);
new_efivar->kobj.kset = &vars_subsys; new_efivar->kobj.kset = vars_kset;
new_efivar->kobj.ktype = &efivar_ktype; new_efivar->kobj.ktype = &efivar_ktype;
i = kobject_register(&new_efivar->kobj); i = kobject_register(&new_efivar->kobj);
if (i) { if (i) {
@ -675,12 +675,10 @@ efivars_init(void)
goto out_free; goto out_free;
} }
vars_subsys.kobj.kset = efi_kset; vars_kset = kset_create_and_add("vars", NULL, &efi_kset->kobj);
if (!vars_kset) {
error = subsystem_register(&vars_subsys); printk(KERN_ERR "efivars: Subsystem registration failed.\n");
error = -ENOMEM;
if (error) {
printk(KERN_ERR "efivars: Subsystem registration failed with error %d.\n", error);
goto out_firmware_unregister; goto out_firmware_unregister;
} }
@ -715,12 +713,12 @@ efivars_init(void)
* Now add attributes to allow creation of new vars * Now add attributes to allow creation of new vars
* and deletion of existing ones... * and deletion of existing ones...
*/ */
error = sysfs_create_bin_file(&vars_subsys.kobj, error = sysfs_create_bin_file(&vars_kset->kobj,
&var_subsys_attr_new_var); &var_subsys_attr_new_var);
if (error) if (error)
printk(KERN_ERR "efivars: unable to create new_var sysfs file" printk(KERN_ERR "efivars: unable to create new_var sysfs file"
" due to error %d\n", error); " due to error %d\n", error);
error = sysfs_create_bin_file(&vars_subsys.kobj, error = sysfs_create_bin_file(&vars_kset->kobj,
&var_subsys_attr_del_var); &var_subsys_attr_del_var);
if (error) if (error)
printk(KERN_ERR "efivars: unable to create del_var sysfs file" printk(KERN_ERR "efivars: unable to create del_var sysfs file"
@ -733,7 +731,7 @@ efivars_init(void)
else else
goto out_free; goto out_free;
subsystem_unregister(&vars_subsys); kset_unregister(vars_kset);
out_firmware_unregister: out_firmware_unregister:
kset_unregister(efi_kset); kset_unregister(efi_kset);
@ -756,7 +754,7 @@ efivars_exit(void)
efivar_unregister(entry); efivar_unregister(entry);
} }
subsystem_unregister(&vars_subsys); kset_unregister(vars_kset);
kset_unregister(efi_kset); kset_unregister(efi_kset);
} }