diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-20 01:08:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-20 01:08:10 -0800 |
| commit | 6e3ae6434b49f650f2687321a8b1374b4d5d2d95 (patch) | |
| tree | 0b4045573c0a1eceb960eb9734d08d677287e4ed /driver | |
| parent | d8bb8bac42f96e5ffd6fb43889d8cc4b8b6e5994 (diff) | |
| download | patches-6e3ae6434b49f650f2687321a8b1374b4d5d2d95.tar.gz | |
fix up some debug lines in driver/kobject-auto-cleanup-on-final-unref.patch
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/kobject-auto-cleanup-on-final-unref.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/driver/kobject-auto-cleanup-on-final-unref.patch b/driver/kobject-auto-cleanup-on-final-unref.patch index 90dee5443b1bf5..4e20c2b419a251 100644 --- a/driver/kobject-auto-cleanup-on-final-unref.patch +++ b/driver/kobject-auto-cleanup-on-final-unref.patch @@ -21,9 +21,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/base/core.c | 32 +-------- include/linux/kobject.h | 5 + - lib/kobject.c | 169 ++++++++++++++++++++++++++---------------------- + lib/kobject.c | 170 +++++++++++++++++++++++++++--------------------- lib/kobject_uevent.c | 11 +++ - 4 files changed, 118 insertions(+), 99 deletions(-) + 4 files changed, 119 insertions(+), 99 deletions(-) --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -174,7 +174,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - pr_debug("kobject (%p) attempted to be registered with no " + + if (!kobj->k_name || !kobj->k_name[0]) { -+ pr_debug("kobject (%p) attempted to be registered with empty " ++ pr_debug("kobject: (%p): attempted to be registered with empty " "name!\n", kobj); WARN_ON(1); - kobject_put(kobj); @@ -326,7 +326,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -565,21 +566,42 @@ struct kobject * kobject_get(struct kobj +@@ -565,21 +566,43 @@ struct kobject * kobject_get(struct kobj */ static void kobject_cleanup(struct kobject *kobj) { @@ -340,26 +340,27 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kobject_name(kobj), kobj, __FUNCTION__); + + if (t && !t->release) -+ pr_debug("kobject: '%s' (%p) does not have a release() " ++ pr_debug("kobject: '%s' (%p): does not have a release() " + "function, it is broken and must be fixed.\n", + kobject_name(kobj), kobj); + + /* send "remove" if the caller did not do it but sent "add" */ + if (kobj->state_add_uevent_sent && !kobj->state_remove_uevent_sent) { -+ pr_debug("kobject: '%s' (%p) auto cleanup 'remove' event", ++ pr_debug("kobject: '%s' (%p): auto cleanup 'remove' event\n", + kobject_name(kobj), kobj); + kobject_uevent(kobj, KOBJ_REMOVE); + } + + /* remove from sysfs if the caller did not do it */ + if (kobj->state_in_sysfs) { -+ pr_debug("kobject: '%s' (%p) auto cleanup kobject_del\n", ++ pr_debug("kobject: '%s' (%p): auto cleanup kobject_del\n", + kobject_name(kobj), kobj); + kobject_del(kobj); + } + if (t && t->release) { -+ pr_debug("kobject: (%p) calling ktype release\n", kobj); ++ pr_debug("kobject: '%s' (%p): calling ktype release\n", ++ kobject_name(kobj), kobj); t->release(kobj); - /* If we have a release function, we can guess that this was - * not a statically allocated kobject, so we should be safe to @@ -368,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + /* free name if we allocated it */ + if (name_set && name) { -+ pr_debug("kobject: '%s' free name\n", name); ++ pr_debug("kobject: '%s': free name\n", name); kfree(name); } - if (s) @@ -376,7 +377,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static void kobject_release(struct kref *kref) -@@ -601,8 +623,7 @@ void kobject_put(struct kobject * kobj) +@@ -601,8 +624,7 @@ void kobject_put(struct kobject * kobj) static void dynamic_kobj_release(struct kobject *kobj) { |