diff options
Diffstat (limited to 'lib/kobject.c')
-rw-r--r-- | lib/kobject.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 25204a41a9b0..687ab418d292 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
@@ -128,6 +128,7 @@ void kobject_init(struct kobject * kobj) | |||
128 | { | 128 | { |
129 | kref_init(&kobj->kref); | 129 | kref_init(&kobj->kref); |
130 | INIT_LIST_HEAD(&kobj->entry); | 130 | INIT_LIST_HEAD(&kobj->entry); |
131 | init_waitqueue_head(&kobj->poll); | ||
131 | kobj->kset = kset_get(kobj->kset); | 132 | kobj->kset = kset_get(kobj->kset); |
132 | } | 133 | } |
133 | 134 | ||
@@ -197,14 +198,14 @@ int kobject_add(struct kobject * kobj) | |||
197 | 198 | ||
198 | /* be noisy on error issues */ | 199 | /* be noisy on error issues */ |
199 | if (error == -EEXIST) | 200 | if (error == -EEXIST) |
200 | printk("kobject_add failed for %s with -EEXIST, " | 201 | pr_debug("kobject_add failed for %s with -EEXIST, " |
201 | "don't try to register things with the " | 202 | "don't try to register things with the " |
202 | "same name in the same directory.\n", | 203 | "same name in the same directory.\n", |
203 | kobject_name(kobj)); | 204 | kobject_name(kobj)); |
204 | else | 205 | else |
205 | printk("kobject_add failed for %s (%d)\n", | 206 | pr_debug("kobject_add failed for %s (%d)\n", |
206 | kobject_name(kobj), error); | 207 | kobject_name(kobj), error); |
207 | dump_stack(); | 208 | /* dump_stack(); */ |
208 | } | 209 | } |
209 | 210 | ||
210 | return error; | 211 | return error; |
@@ -421,7 +422,6 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name) | |||
421 | 422 | ||
422 | return k; | 423 | return k; |
423 | } | 424 | } |
424 | EXPORT_SYMBOL_GPL(kobject_add_dir); | ||
425 | 425 | ||
426 | /** | 426 | /** |
427 | * kset_init - initialize a kset for use | 427 | * kset_init - initialize a kset for use |
@@ -568,7 +568,7 @@ int subsys_create_file(struct subsystem * s, struct subsys_attribute * a) | |||
568 | * @s: subsystem. | 568 | * @s: subsystem. |
569 | * @a: attribute desciptor. | 569 | * @a: attribute desciptor. |
570 | */ | 570 | */ |
571 | 571 | #if 0 | |
572 | void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) | 572 | void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) |
573 | { | 573 | { |
574 | if (subsys_get(s)) { | 574 | if (subsys_get(s)) { |
@@ -576,6 +576,7 @@ void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) | |||
576 | subsys_put(s); | 576 | subsys_put(s); |
577 | } | 577 | } |
578 | } | 578 | } |
579 | #endif /* 0 */ | ||
579 | 580 | ||
580 | EXPORT_SYMBOL(kobject_init); | 581 | EXPORT_SYMBOL(kobject_init); |
581 | EXPORT_SYMBOL(kobject_register); | 582 | EXPORT_SYMBOL(kobject_register); |
@@ -587,10 +588,7 @@ EXPORT_SYMBOL(kobject_del); | |||
587 | 588 | ||
588 | EXPORT_SYMBOL(kset_register); | 589 | EXPORT_SYMBOL(kset_register); |
589 | EXPORT_SYMBOL(kset_unregister); | 590 | EXPORT_SYMBOL(kset_unregister); |
590 | EXPORT_SYMBOL(kset_find_obj); | ||
591 | 591 | ||
592 | EXPORT_SYMBOL(subsystem_init); | ||
593 | EXPORT_SYMBOL(subsystem_register); | 592 | EXPORT_SYMBOL(subsystem_register); |
594 | EXPORT_SYMBOL(subsystem_unregister); | 593 | EXPORT_SYMBOL(subsystem_unregister); |
595 | EXPORT_SYMBOL(subsys_create_file); | 594 | EXPORT_SYMBOL(subsys_create_file); |
596 | EXPORT_SYMBOL(subsys_remove_file); | ||