korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

kobject: Remove redundant checks for whether ktype is NULL

Browse Source 
When adding koject or kset, we have made sure that ktype cannot be NULL.
Therefore, after adding koject or kset, there is no need to worry about
ktype being NULL. Clear all ktype-related redundancy checks.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20230805084114.1298-3-thunder.leizhen@huaweicloud.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Zhen Lei 2023-08-05 16:41:14 +08:00 committed by Greg Kroah-Hartman
parent 4d0fe8c52b
commit 1b28cb81da
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/kobject.c
View File

@ -74,12 +74,10 @@ static int create_dir(struct kobject *kobj)
if (error) if (error)
return error; return error;
if (ktype) { error = sysfs_create_groups(kobj, ktype->default_groups);
error = sysfs_create_groups(kobj, ktype->default_groups); if (error) {
if (error) { sysfs_remove_dir(kobj);
sysfs_remove_dir(kobj); return error;
return error;
}
} }
/* /*
@ -591,8 +589,7 @@ static void __kobject_del(struct kobject *kobj)
sd = kobj->sd; sd = kobj->sd;
ktype = get_ktype(kobj); ktype = get_ktype(kobj);
if (ktype) sysfs_remove_groups(kobj, ktype->default_groups);
sysfs_remove_groups(kobj, ktype->default_groups);
/* send "remove" if the caller did not do it but sent "add" */ /* send "remove" if the caller did not do it but sent "add" */
if (kobj->state_add_uevent_sent && !kobj->state_remove_uevent_sent) { if (kobj->state_add_uevent_sent && !kobj->state_remove_uevent_sent) {
@ -669,10 +666,6 @@ static void kobject_cleanup(struct kobject *kobj)
pr_debug("'%s' (%p): %s, parent %p\n", pr_debug("'%s' (%p): %s, parent %p\n",
kobject_name(kobj), kobj, __func__, kobj->parent); kobject_name(kobj), kobj, __func__, kobj->parent);
if (t && !t->release)
pr_debug("'%s' (%p): does not have a release() function, it is broken and must be fixed. See Documentation/core-api/kobject.rst.\n",
kobject_name(kobj), kobj);
/* remove from sysfs if the caller did not do it */ /* remove from sysfs if the caller did not do it */
if (kobj->state_in_sysfs) { if (kobj->state_in_sysfs) {
pr_debug("'%s' (%p): auto cleanup kobject_del\n", pr_debug("'%s' (%p): auto cleanup kobject_del\n",
@ -683,10 +676,13 @@ static void kobject_cleanup(struct kobject *kobj)
parent = NULL; parent = NULL;
} }
if (t && t->release) { if (t->release) {
pr_debug("'%s' (%p): calling ktype release\n", pr_debug("'%s' (%p): calling ktype release\n",
kobject_name(kobj), kobj); kobject_name(kobj), kobj);
t->release(kobj); t->release(kobj);
} else {
pr_debug("'%s' (%p): does not have a release() function, it is broken and must be fixed. See Documentation/core-api/kobject.rst.\n",
kobject_name(kobj), kobj);
} }
/* free name if we allocated it */ /* free name if we allocated it */
@ -1060,7 +1056,7 @@ const struct kobj_ns_type_operations *kobj_child_ns_ops(const struct kobject *pa
{ {
const struct kobj_ns_type_operations *ops = NULL; const struct kobj_ns_type_operations *ops = NULL;
if (parent && parent->ktype && parent->ktype->child_ns_type) if (parent && parent->ktype->child_ns_type)
ops = parent->ktype->child_ns_type(parent); ops = parent->ktype->child_ns_type(parent);
return ops; return ops;