aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-18 01:05:35 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:38 -0500
commite1543ddf739b22a8c4218716ad50c26b3e147403 (patch)
tree584f63bf431368d366f2d156abc4ec85636dfe2f /lib
parentb2d6db5878a0832659ed58476357eea2db915550 (diff)
Kobject: remove kobject_init() as no one uses it anymore
The old kobject_init() function is on longer in use, so let us remove it from the public scope (kset mess in the kobject.c file still uses it, but that can be cleaned up later very simply.) Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/kobject.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 359e114790cb..10d977b6e69d 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -124,11 +124,7 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
124} 124}
125EXPORT_SYMBOL_GPL(kobject_get_path); 125EXPORT_SYMBOL_GPL(kobject_get_path);
126 126
127/** 127static void kobject_init_internal(struct kobject * kobj)
128 * kobject_init - initialize object.
129 * @kobj: object in question.
130 */
131void kobject_init(struct kobject * kobj)
132{ 128{
133 if (!kobj) 129 if (!kobj)
134 return; 130 return;
@@ -232,7 +228,7 @@ int kobject_register(struct kobject * kobj)
232{ 228{
233 int error = -EINVAL; 229 int error = -EINVAL;
234 if (kobj) { 230 if (kobj) {
235 kobject_init(kobj); 231 kobject_init_internal(kobj);
236 error = kobject_add(kobj); 232 error = kobject_add(kobj);
237 if (!error) 233 if (!error)
238 kobject_uevent(kobj, KOBJ_ADD); 234 kobject_uevent(kobj, KOBJ_ADD);
@@ -695,7 +691,7 @@ EXPORT_SYMBOL_GPL(kobject_create_and_add);
695 691
696void kset_init(struct kset * k) 692void kset_init(struct kset * k)
697{ 693{
698 kobject_init(&k->kobj); 694 kobject_init_internal(&k->kobj);
699 INIT_LIST_HEAD(&k->list); 695 INIT_LIST_HEAD(&k->list);
700 spin_lock_init(&k->list_lock); 696 spin_lock_init(&k->list_lock);
701} 697}
@@ -887,7 +883,6 @@ struct kset *kset_create_and_add(const char *name,
887} 883}
888EXPORT_SYMBOL_GPL(kset_create_and_add); 884EXPORT_SYMBOL_GPL(kset_create_and_add);
889 885
890EXPORT_SYMBOL(kobject_init);
891EXPORT_SYMBOL(kobject_register); 886EXPORT_SYMBOL(kobject_register);
892EXPORT_SYMBOL(kobject_unregister); 887EXPORT_SYMBOL(kobject_unregister);
893EXPORT_SYMBOL(kobject_get); 888EXPORT_SYMBOL(kobject_get);