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:
  sysfs: cosmetic clean up on node creation failure paths
  sysfs: kill an extra put in sysfs_create_link() failure path
  Driver core: check return code of sysfs_create_link()
  HOWTO: Add the knwon_regression URI to the documentation
  dev_vdbg() documentation
  dev_vdbg(), available with -DVERBOSE_DEBUG
  sysfs: make sysfs_init_inode() static
  sysfs: fix sysfs root inode nlink accounting
  Documentation fix devres.txt: lib/iomap.c -> lib/devres.c
  sysfs: avoid kmem_cache_free(NULL)
  PM: remove deprecated dpm_runtime_* routines
  PM: Remove deprecated sysfs files
  Driver core: accept all valid action-strings in uevent-trigger
  debugfs: remove rmdir() non-empty complaint

1 files changed, 10 insertions, 20 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index bd5ecbbafab1..6a80c784a8fb 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -33,25 +33,15 @@ static DEFINE_SPINLOCK(sequence_lock);
 static struct sock *uevent_sock;
 #endif
 
-static char *action_to_string(enum kobject_action action)
-{
-        switch (action) {
-        case KOBJ_ADD:
-                return "add";
-        case KOBJ_REMOVE:
-                return "remove";
-        case KOBJ_CHANGE:
-                return "change";
-        case KOBJ_OFFLINE:
-                return "offline";
-        case KOBJ_ONLINE:
-                return "online";
-        case KOBJ_MOVE:
-                return "move";
-        default:
-                return NULL;
-        }
-}
+/* the strings here must match the enum in include/linux/kobject.h */
+const char *kobject_actions[] = {
+        "add",
+        "remove",
+        "change",
+        "move",
+        "online",
+        "offline",
+};
 
 /**
  * kobject_uevent_env - send an uevent with environmental data
@@ -83,7 +73,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 
         pr_debug("%s\n", __FUNCTION__);
 
-        action_string = action_to_string(action);
+        action_string = kobject_actions[action];
         if (!action_string) {
                 pr_debug("kobject attempted to send uevent without action_string!\n");
                 return -EINVAL;