---

yaml --- r: 75856 b: refs/heads/master c: 12e339a h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · 261dc46 · 261dc46
1 parent a8aa314
commit 261dc46
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d06adfaf82d154023141ddc0c9de18b6a49090b
+refs/heads/master: 12e339ac6e31a34fe42396aec8fb1c0b43caf61e
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
@@ -158,7 +158,6 @@ struct kset {
 };
 
 extern void kset_init(struct kset * k);
-extern int __must_check kset_add(struct kset * k);
 extern int __must_check kset_register(struct kset * k);
 extern void kset_unregister(struct kset * k);
 extern struct kset * __must_check kset_create_and_add(const char *name,

diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
@@ -709,17 +709,6 @@ struct sysfs_ops kobj_sysfs_ops = {
 	.store	= kobj_attr_store,
 };
 
-/**
- *	kset_add - add a kset object to the hierarchy.
- *	@k:	kset.
- */
-
-int kset_add(struct kset * k)
-{
-	return kobject_add_internal(&k->kobj);
-}
-
-
 /**
  *	kset_register - initialize and add a kset.
  *	@k:	kset.
@@ -733,7 +722,7 @@ int kset_register(struct kset * k)
 		return -EINVAL;
 
 	kset_init(k);
-	err = kset_add(k);
+	err = kobject_add_internal(&k->kobj);
 	if (err)
 		return err;
 	kobject_uevent(&k->kobj, KOBJ_ADD);