[PATCH 05/10] Driver: remove redundant kobject_unregister checks
From: Mariusz Kozlowski <[EMAIL PROTECTED]>
Here is a patch that removes all redundant kobject_unregister argument checks.
Signed-off-by: Mariusz Kozlowski <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/base/class.c |3 +--
fs/partitions/check.c |9 +++--
kernel/module.c |7 ++-
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 96def1d..1417e5c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -163,8 +163,7 @@ int class_register(struct class * cls)
void class_unregister(struct class * cls)
{
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);
subsystem_unregister(>subsys);
}
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ac32a2e..22d38ff 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -358,8 +358,7 @@ void delete_partition(struct gendisk *disk, int part)
p->ios[0] = p->ios[1] = 0;
p->sectors[0] = p->sectors[1] = 0;
sysfs_remove_link(>kobj, "subsystem");
- if (p->holder_dir)
- kobject_unregister(p->holder_dir);
+ kobject_unregister(p->holder_dir);
kobject_uevent(>kobj, KOBJ_REMOVE);
kobject_del(>kobj);
kobject_put(>kobj);
@@ -603,10 +602,8 @@ void del_gendisk(struct gendisk *disk)
disk->stamp = 0;
kobject_uevent(>kobj, KOBJ_REMOVE);
- if (disk->holder_dir)
- kobject_unregister(disk->holder_dir);
- if (disk->slave_dir)
- kobject_unregister(disk->slave_dir);
+ kobject_unregister(disk->holder_dir);
+ kobject_unregister(disk->slave_dir);
if (disk->driverfs_dev) {
char *disk_name = make_block_name(disk);
sysfs_remove_link(>kobj, "device");
diff --git a/kernel/module.c b/kernel/module.c
index 225501f..e06b77a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1180,11 +1180,8 @@ static void mod_kobject_remove(struct module *mod)
{
module_remove_modinfo_attrs(mod);
module_param_sysfs_remove(mod);
- if (mod->mkobj.drivers_dir)
- kobject_unregister(mod->mkobj.drivers_dir);
- if (mod->holders_dir)
- kobject_unregister(mod->holders_dir);
-
+ kobject_unregister(mod->mkobj.drivers_dir);
+ kobject_unregister(mod->holders_dir);
kobject_unregister(>mkobj.kobj);
}
--
1.5.0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 05/10] Driver: remove redundant kobject_unregister checks
From: Mariusz Kozlowski [EMAIL PROTECTED]
Here is a patch that removes all redundant kobject_unregister argument checks.
Signed-off-by: Mariusz Kozlowski [EMAIL PROTECTED]
Signed-off-by: Greg Kroah-Hartman [EMAIL PROTECTED]
---
drivers/base/class.c |3 +--
fs/partitions/check.c |9 +++--
kernel/module.c |7 ++-
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 96def1d..1417e5c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -163,8 +163,7 @@ int class_register(struct class * cls)
void class_unregister(struct class * cls)
{
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);
subsystem_unregister(cls-subsys);
}
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ac32a2e..22d38ff 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -358,8 +358,7 @@ void delete_partition(struct gendisk *disk, int part)
p-ios[0] = p-ios[1] = 0;
p-sectors[0] = p-sectors[1] = 0;
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_del(p-kobj);
kobject_put(p-kobj);
@@ -603,10 +602,8 @@ void del_gendisk(struct gendisk *disk)
disk-stamp = 0;
kobject_uevent(disk-kobj, KOBJ_REMOVE);
- if (disk-holder_dir)
- kobject_unregister(disk-holder_dir);
- if (disk-slave_dir)
- kobject_unregister(disk-slave_dir);
+ kobject_unregister(disk-holder_dir);
+ kobject_unregister(disk-slave_dir);
if (disk-driverfs_dev) {
char *disk_name = make_block_name(disk);
sysfs_remove_link(disk-kobj, device);
diff --git a/kernel/module.c b/kernel/module.c
index 225501f..e06b77a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1180,11 +1180,8 @@ static void mod_kobject_remove(struct module *mod)
{
module_remove_modinfo_attrs(mod);
module_param_sysfs_remove(mod);
- if (mod-mkobj.drivers_dir)
- kobject_unregister(mod-mkobj.drivers_dir);
- if (mod-holders_dir)
- kobject_unregister(mod-holders_dir);
-
+ kobject_unregister(mod-mkobj.drivers_dir);
+ kobject_unregister(mod-holders_dir);
kobject_unregister(mod-mkobj.kobj);
}
--
1.5.0
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
