aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryan <clouds.yan@gmail.com>2012-04-20 21:25:53 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-23 13:34:29 -0700
commit6b9606106ba58d2bd80610f97e06fea58206b47c (patch)
treecb6c557872521dced6b92ede4e486901b93b2d46
parent9169c01236ab29ce55c93aaf22ec6ecc65c46d1a (diff)
lib/kobject.c : Remove redundant check in create_dir
create_dir is a static function used only in kobject_add_internal. There's no need to do check here, for kobject_add_internal will reject kobject with invalid name. Signed-off-by: Yan Hong <clouds.yan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--lib/kobject.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 21dee7c19afd..bbffa2110d43 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -47,13 +47,11 @@ static int populate_dir(struct kobject *kobj)
static int create_dir(struct kobject *kobj)
{
int error = 0;
- if (kobject_name(kobj)) {
- error = sysfs_create_dir(kobj);
- if (!error) {
- error = populate_dir(kobj);
- if (error)
- sysfs_remove_dir(kobj);
- }
+ error = sysfs_create_dir(kobj);
+ if (!error) {
+ error = populate_dir(kobj);
+ if (error)
+ sysfs_remove_dir(kobj);
}
return error;
}