GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kobject: convert remaining kobject_unregister() to kobject_put()

Browse source 
There is no need for kobject_unregister() anymore, thanks to Kay's
kobject cleanup changes, so replace all instances of it with
kobject_put().


Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-12-20 08:13:05 -08:00
parent 197b12d679
commit 78a2d906b4
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/ksysfs.c
View file

@ -154,7 +154,7 @@ notes_exit:
group_exit: group_exit:
sysfs_remove_group(kernel_kobj, &kernel_attr_group); sysfs_remove_group(kernel_kobj, &kernel_attr_group);
kset_exit: kset_exit:
kobject_unregister(kernel_kobj); kobject_put(kernel_kobj);
exit: exit:
return error; return error;
} }

9
kernel/module.c
View file

@ -1257,9 +1257,8 @@ int mod_sysfs_setup(struct module *mod,
out_unreg_param: out_unreg_param:
module_param_sysfs_remove(mod); module_param_sysfs_remove(mod);
out_unreg_holders: out_unreg_holders:
kobject_unregister(mod->holders_dir); kobject_put(mod->holders_dir);
out_unreg: out_unreg:
kobject_del(&mod->mkobj.kobj);
kobject_put(&mod->mkobj.kobj); kobject_put(&mod->mkobj.kobj);
return err; return err;
} }
@ -1269,9 +1268,9 @@ static void mod_kobject_remove(struct module *mod)
{ {
module_remove_modinfo_attrs(mod); module_remove_modinfo_attrs(mod);
module_param_sysfs_remove(mod); module_param_sysfs_remove(mod);
kobject_unregister(mod->mkobj.drivers_dir); kobject_put(mod->mkobj.drivers_dir);
kobject_unregister(mod->holders_dir); kobject_put(mod->holders_dir);
kobject_unregister(&mod->mkobj.kobj); kobject_put(&mod->mkobj.kobj);
} }
/* /*

4
lib/kobject.c
View file

@ -664,7 +664,7 @@ struct kobject *kobject_create(void)
* *
* This function creates a kset structure dynamically and registers it * This function creates a kset structure dynamically and registers it
* with sysfs. When you are finished with this structure, call * with sysfs. When you are finished with this structure, call
* kobject_unregister() and the structure will be dynamically freed when * kobject_put() and the structure will be dynamically freed when
* it is no longer being used. * it is no longer being used.
* *
* If the kobject was not able to be created, NULL will be returned. * If the kobject was not able to be created, NULL will be returned.
@ -761,7 +761,7 @@ void kset_unregister(struct kset * k)
{ {
if (!k) if (!k)
return; return;
kobject_unregister(&k->kobj); kobject_put(&k->kobj);
} }

2
net/bridge/br_sysfs_br.c
View file

@ -447,7 +447,7 @@ void br_sysfs_delbr(struct net_device *dev)
struct kobject *kobj = &dev->dev.kobj; struct kobject *kobj = &dev->dev.kobj;
struct net_bridge *br = netdev_priv(dev); struct net_bridge *br = netdev_priv(dev);
kobject_unregister(br->ifobj); kobject_put(br->ifobj);
sysfs_remove_bin_file(kobj, &bridge_forward); sysfs_remove_bin_file(kobj, &bridge_forward);
sysfs_remove_group(kobj, &bridge_group); sysfs_remove_group(kobj, &bridge_group);
} }

2
security/inode.c
View file

@ -327,7 +327,7 @@ static int __init securityfs_init(void)
retval = register_filesystem(&fs_type); retval = register_filesystem(&fs_type);
if (retval) if (retval)
kobject_unregister(security_kobj); kobject_put(security_kobj);
return retval; return retval;
} }