---

yaml --- r: 75855 b: refs/heads/master c: 6d06adf h: refs/heads/master i: 75853: aa7e8d2 75851: ad889f2 75847: 115529b 75839: 21843c0 v: v3
git-mirror · Jan 25, 2008 · a8aa314 · a8aa314
1 parent 2f5d5ed
commit a8aa314
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cb074bff8e762ef24c44678a5a7d907f82fbeb
+refs/heads/master: 6d06adfaf82d154023141ddc0c9de18b6a49090b
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
@@ -96,7 +96,6 @@ extern struct kobject * __must_check kobject_create_and_add(const char *name,
 extern int __must_check kobject_rename(struct kobject *, const char *new_name);
 extern int __must_check kobject_move(struct kobject *, struct kobject *);
 
-extern int __must_check kobject_register(struct kobject *);
 extern void kobject_unregister(struct kobject *);
 
 extern struct kobject * kobject_get(struct kobject *);

diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
@@ -219,23 +219,6 @@ static int kobject_add_internal(struct kobject *kobj)
 	return error;
 }
 
-/**
- *	kobject_register - initialize and add an object.
- *	@kobj:	object in question.
- */
-
-int kobject_register(struct kobject * kobj)
-{
-	int error = -EINVAL;
-	if (kobj) {
-		kobject_init_internal(kobj);
-		error = kobject_add(kobj);
-		if (!error)
-			kobject_uevent(kobj, KOBJ_ADD);
-	}
-	return error;
-}
-
 /**
  * kobject_set_name_vargs - Set the name of an kobject
  * @kobj: struct kobject to set the name of
@@ -883,7 +866,6 @@ struct kset *kset_create_and_add(const char *name,
 }
 EXPORT_SYMBOL_GPL(kset_create_and_add);
 
-EXPORT_SYMBOL(kobject_register);
 EXPORT_SYMBOL(kobject_unregister);
 EXPORT_SYMBOL(kobject_get);
 EXPORT_SYMBOL(kobject_put);