From foo@baz Tue Apr 9 12:12:43 2002 Date: Wed, 7 Nov 2007 13:56:19 -0800 To: Greg KH From: Greg Kroah-Hartman Subject: kobject: convert efivars to use kobject_create Using a kset for this simple directory is an overkill. Cc: Kay Sievers Cc: Matt Domsch Cc: Matt Tolentino Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efivars.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -573,7 +573,7 @@ static struct attribute_group efi_subsys static struct kset *vars_kset; -static struct kset *efi_kset; +static struct kobject *efi_kobj; /* * efivar_create_sysfs_entry() @@ -665,17 +665,15 @@ 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 - */ - efi_kset = kset_create_and_register("efi", NULL, firmware_kobj, NULL); - if (!efi_kset) { + /* For now we'll register the efi directory at /sys/firmware/efi */ + efi_kobj = kobject_create_and_register("efi", firmware_kobj); + if (!efi_kobj) { printk(KERN_ERR "efivars: Firmware registration failed.\n"); error = -ENOMEM; goto out_free; } - vars_kset = kset_create_and_register("vars", NULL, NULL, efi_kset); + vars_kset = kset_create_and_register("vars", NULL, efi_kobj, NULL); if (!vars_kset) { printk(KERN_ERR "efivars: Subsystem registration failed.\n"); error = -ENOMEM; @@ -717,7 +715,7 @@ efivars_init(void) sysfs_create_bin_file(&vars_kset->kobj, &var_subsys_attr_del_var); /* Don't forget the systab entry */ - error = sysfs_create_group(&efi_kset->kobj, &efi_subsys_attr_group); + 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 @@ -726,7 +724,7 @@ efivars_init(void) kset_unregister(vars_kset); out_firmware_unregister: - kset_unregister(efi_kset); + kobject_unregister(efi_kobj); out_free: kfree(variable_name); @@ -747,7 +745,7 @@ efivars_exit(void) } kset_unregister(vars_kset); - kset_unregister(efi_kset); + kobject_unregister(efi_kobj); } module_init(efivars_init);