lkml.org 
[lkml]   [2004]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] Driver Core update and fixes for 2.6.1
Date
From
ChangeSet 1.1495, 2004/01/19 16:21:50-08:00, dtor_core@ameritech.net

[PATCH] kobject: make kobject hotplug function public

make kobject hotplug mechanism public so that others may call it.


include/linux/kobject.h | 1
lib/kobject.c | 49 ++++++++++++++++++++----------------------------
2 files changed, 22 insertions(+), 28 deletions(-)


diff -Nru a/include/linux/kobject.h b/include/linux/kobject.h
--- a/include/linux/kobject.h Mon Jan 19 17:05:23 2004
+++ b/include/linux/kobject.h Mon Jan 19 17:05:23 2004
@@ -56,6 +56,7 @@
extern struct kobject * kobject_get(struct kobject *);
extern void kobject_put(struct kobject *);

+extern void kobject_hotplug(const char *action, struct kobject *);

struct kobj_type {
void (*release)(struct kobject *);
diff -Nru a/lib/kobject.c b/lib/kobject.c
--- a/lib/kobject.c Mon Jan 19 17:05:23 2004
+++ b/lib/kobject.c Mon Jan 19 17:05:23 2004
@@ -198,9 +198,24 @@
kfree(envp);
return;
}
+
+void kobject_hotplug(const char *action, struct kobject *kobj)
+{
+ struct kobject * top_kobj = kobj;
+
+ /* If this kobj does not belong to a kset,
+ try to find a parent that does. */
+ if (!top_kobj->kset && top_kobj->parent) {
+ do {
+ top_kobj = top_kobj->parent;
+ } while (!top_kobj->kset && top_kobj->parent);
+ }
+
+ if (top_kobj->kset && top_kobj->kset->hotplug_ops)
+ kset_hotplug(action, top_kobj->kset, kobj);
+}
#else
-static void kset_hotplug(const char *action, struct kset *kset,
- struct kobject *kobj)
+void kobject_hotplug(const char *action, struct kobject *kobj)
{
return;
}
@@ -248,7 +263,6 @@
{
int error = 0;
struct kobject * parent;
- struct kobject * top_kobj;

if (!(kobj = kobject_get(kobj)))
return -ENOENT;
@@ -277,18 +291,9 @@
if (parent)
kobject_put(parent);
} else {
- /* If this kobj does not belong to a kset,
- try to find a parent that does. */
- top_kobj = kobj;
- if (!top_kobj->kset && top_kobj->parent) {
- do {
- top_kobj = top_kobj->parent;
- } while (!top_kobj->kset && top_kobj->parent);
- }
-
- if (top_kobj->kset && top_kobj->kset->hotplug_ops)
- kset_hotplug("add", top_kobj->kset, kobj);
+ kobject_hotplug("add", kobj);
}
+
return error;
}

@@ -396,20 +401,7 @@

void kobject_del(struct kobject * kobj)
{
- struct kobject * top_kobj;
-
- /* If this kobj does not belong to a kset,
- try to find a parent that does. */
- top_kobj = kobj;
- if (!top_kobj->kset && top_kobj->parent) {
- do {
- top_kobj = top_kobj->parent;
- } while (!top_kobj->kset && top_kobj->parent);
- }
-
- if (top_kobj->kset && top_kobj->kset->hotplug_ops)
- kset_hotplug("remove", top_kobj->kset, kobj);
-
+ kobject_hotplug("remove", kobj);
sysfs_remove_dir(kobj);
unlink(kobj);
}
@@ -638,6 +630,7 @@
EXPORT_SYMBOL(kobject_unregister);
EXPORT_SYMBOL(kobject_get);
EXPORT_SYMBOL(kobject_put);
+EXPORT_SYMBOL(kobject_hotplug);

EXPORT_SYMBOL(kset_register);
EXPORT_SYMBOL(kset_unregister);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:00    [W:0.069 / U:0.024 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site