mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
Driver: remove redundant kobject_unregister checks
Here is a patch that removes all redundant kobject_unregister argument checks. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
1350770112
commit
b92be9f1ec
3 changed files with 6 additions and 13 deletions
|
@ -163,7 +163,6 @@ int class_register(struct class * cls)
|
||||||
void class_unregister(struct class * cls)
|
void class_unregister(struct class * cls)
|
||||||
{
|
{
|
||||||
pr_debug("device class '%s': unregistering\n", cls->name);
|
pr_debug("device class '%s': unregistering\n", cls->name);
|
||||||
if (cls->virtual_dir)
|
|
||||||
kobject_unregister(cls->virtual_dir);
|
kobject_unregister(cls->virtual_dir);
|
||||||
remove_class_attrs(cls);
|
remove_class_attrs(cls);
|
||||||
subsystem_unregister(&cls->subsys);
|
subsystem_unregister(&cls->subsys);
|
||||||
|
|
|
@ -358,7 +358,6 @@ void delete_partition(struct gendisk *disk, int part)
|
||||||
p->ios[0] = p->ios[1] = 0;
|
p->ios[0] = p->ios[1] = 0;
|
||||||
p->sectors[0] = p->sectors[1] = 0;
|
p->sectors[0] = p->sectors[1] = 0;
|
||||||
sysfs_remove_link(&p->kobj, "subsystem");
|
sysfs_remove_link(&p->kobj, "subsystem");
|
||||||
if (p->holder_dir)
|
|
||||||
kobject_unregister(p->holder_dir);
|
kobject_unregister(p->holder_dir);
|
||||||
kobject_uevent(&p->kobj, KOBJ_REMOVE);
|
kobject_uevent(&p->kobj, KOBJ_REMOVE);
|
||||||
kobject_del(&p->kobj);
|
kobject_del(&p->kobj);
|
||||||
|
@ -603,9 +602,7 @@ void del_gendisk(struct gendisk *disk)
|
||||||
disk->stamp = 0;
|
disk->stamp = 0;
|
||||||
|
|
||||||
kobject_uevent(&disk->kobj, KOBJ_REMOVE);
|
kobject_uevent(&disk->kobj, KOBJ_REMOVE);
|
||||||
if (disk->holder_dir)
|
|
||||||
kobject_unregister(disk->holder_dir);
|
kobject_unregister(disk->holder_dir);
|
||||||
if (disk->slave_dir)
|
|
||||||
kobject_unregister(disk->slave_dir);
|
kobject_unregister(disk->slave_dir);
|
||||||
if (disk->driverfs_dev) {
|
if (disk->driverfs_dev) {
|
||||||
char *disk_name = make_block_name(disk);
|
char *disk_name = make_block_name(disk);
|
||||||
|
|
|
@ -1180,11 +1180,8 @@ 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);
|
||||||
if (mod->mkobj.drivers_dir)
|
|
||||||
kobject_unregister(mod->mkobj.drivers_dir);
|
kobject_unregister(mod->mkobj.drivers_dir);
|
||||||
if (mod->holders_dir)
|
|
||||||
kobject_unregister(mod->holders_dir);
|
kobject_unregister(mod->holders_dir);
|
||||||
|
|
||||||
kobject_unregister(&mod->mkobj.kobj);
|
kobject_unregister(&mod->mkobj.kobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue