Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (75 commits)
  PM: merge device power-management source files
  sysfs: add copyrights
  kobject: update the copyrights
  kset: add some kerneldoc to help describe what these strange things are
  Driver core: rename ktype_edd and ktype_efivar
  Driver core: rename ktype_driver
  Driver core: rename ktype_device
  Driver core: rename ktype_class
  driver core: remove subsystem_init()
  sysfs: move sysfs file poll implementation to sysfs_open_dirent
  sysfs: implement sysfs_open_dirent
  sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir
  sysfs: make sysfs_root a regular directory dirent
  sysfs: open code sysfs_attach_dentry()
  sysfs: make s_elem an anonymous union
  sysfs: make bin attr open get active reference of parent too
  sysfs: kill unnecessary NULL pointer check in sysfs_release()
  sysfs: kill unnecessary sysfs_get() in open paths
  sysfs: reposition sysfs_dirent->s_mode.
  sysfs: kill sysfs_update_file()
  ...

3 files changed, 163 insertions, 191 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 4f3f3e256501..6c4ea33bb2cb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -10,7 +10,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 
-lib-y   += kobject.o kref.o kobject_uevent.o klist.o
+lib-y   += kobject.o kref.o klist.o
 
 obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
          bust_spinlocks.o hexdump.o kasprintf.o
@@ -20,6 +20,7 @@ CFLAGS_kobject.o += -DDEBUG
 CFLAGS_kobject_uevent.o += -DDEBUG
 endif
 
+lib-$(CONFIG_HOTPLUG) += kobject_uevent.o
 obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
 obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
diff --git a/lib/kobject.c b/lib/kobject.c
index 4b08e0ff95c8..03d40360ff1b 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -2,6 +2,8 @@
  * kobject.c - library routines for handling generic kernel objects
  *
  * Copyright (c) 2002-2003 Patrick Mochel <mochel@osdl.org>
+ * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (c) 2006-2007 Novell Inc.
  *
  * This file is released under the GPLv2.
  *
@@ -44,11 +46,11 @@ static int populate_dir(struct kobject * kobj)
         return error;
 }
 
-static int create_dir(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
+static int create_dir(struct kobject * kobj)
 {
         int error = 0;
         if (kobject_name(kobj)) {
-                error = sysfs_create_dir(kobj, shadow_parent);
+                error = sysfs_create_dir(kobj);
                 if (!error) {
                         if ((error = populate_dir(kobj)))
                                 sysfs_remove_dir(kobj);
@@ -131,7 +133,6 @@ void kobject_init(struct kobject * kobj)
                 return;
         kref_init(&kobj->kref);
         INIT_LIST_HEAD(&kobj->entry);
-        init_waitqueue_head(&kobj->poll);
         kobj->kset = kset_get(kobj->kset);
 }
 
@@ -157,12 +158,11 @@ static void unlink(struct kobject * kobj)
 }
 
 /**
- *      kobject_shadow_add - add an object to the hierarchy.
+ *      kobject_add - add an object to the hierarchy.
  *      @kobj:  object.
- *      @shadow_parent: sysfs directory to add to.
  */
 
-int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
+int kobject_add(struct kobject * kobj)
 {
         int error = 0;
         struct kobject * parent;
@@ -170,7 +170,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
         if (!(kobj = kobject_get(kobj)))
                 return -ENOENT;
         if (!kobj->k_name)
-                kobj->k_name = kobj->name;
+                kobject_set_name(kobj, "NO_NAME");
         if (!*kobj->k_name) {
                 pr_debug("kobject attempted to be registered with no name!\n");
                 WARN_ON(1);
@@ -181,7 +181,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
 
         pr_debug("kobject %s: registering. parent: %s, set: %s\n",
                  kobject_name(kobj), parent ? kobject_name(parent) : "<NULL>", 
-                 kobj->kset ? kobj->kset->kobj.name : "<NULL>" );
+                 kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>" );
 
         if (kobj->kset) {
                 spin_lock(&kobj->kset->list_lock);
@@ -194,7 +194,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
                 kobj->parent = parent;
         }
 
-        error = create_dir(kobj, shadow_parent);
+        error = create_dir(kobj);
         if (error) {
                 /* unlink does the kobject_put() for us */
                 unlink(kobj);
@@ -216,16 +216,6 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
 }
 
 /**
- *      kobject_add - add an object to the hierarchy.
- *      @kobj:  object.
- */
-int kobject_add(struct kobject * kobj)
-{
-        return kobject_shadow_add(kobj, NULL);
-}
-
-
-/**
  *      kobject_register - initialize and add an object.
  *      @kobj:  object in question.
  */
@@ -255,54 +245,50 @@ int kobject_register(struct kobject * kobj)
 int kobject_set_name(struct kobject * kobj, const char * fmt, ...)
 {
         int error = 0;
-        int limit = KOBJ_NAME_LEN;
+        int limit;
         int need;
         va_list args;
-        char * name;
+        char *name;
 
-        /* 
-         * First, try the static array 
-         */
-        va_start(args,fmt);
-        need = vsnprintf(kobj->name,limit,fmt,args);
+        /* find out how big a buffer we need */
+        name = kmalloc(1024, GFP_KERNEL);
+        if (!name) {
+                error = -ENOMEM;
+                goto done;
+        }
+        va_start(args, fmt);
+        need = vsnprintf(name, 1024, fmt, args);
         va_end(args);
-        if (need < limit) 
-                name = kobj->name;
-        else {
-                /* 
-                 * Need more space? Allocate it and try again 
-                 */
-                limit = need + 1;
-                name = kmalloc(limit,GFP_KERNEL);
-                if (!name) {
-                        error = -ENOMEM;
-                        goto Done;
-                }
-                va_start(args,fmt);
-                need = vsnprintf(name,limit,fmt,args);
-                va_end(args);
-
-                /* Still? Give up. */
-                if (need >= limit) {
-                        kfree(name);
-                        error = -EFAULT;
-                        goto Done;
-                }
+        kfree(name);
+
+        /* Allocate the new space and copy the string in */
+        limit = need + 1;
+        name = kmalloc(limit, GFP_KERNEL);
+        if (!name) {
+                error = -ENOMEM;
+                goto done;
+        }
+        va_start(args, fmt);
+        need = vsnprintf(name, limit, fmt, args);
+        va_end(args);
+
+        /* something wrong with the string we copied? */
+        if (need >= limit) {
+                kfree(name);
+                error = -EFAULT;
+                goto done;
         }
 
         /* Free the old name, if necessary. */