2 files changed, 32 insertions, 0 deletions

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 57eea4cb940d..e2b8c3dae425 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -84,6 +84,11 @@ extern int __must_check kobject_add(struct kobject *);
 extern int __must_check kobject_add_ng(struct kobject *kobj,
                                        struct kobject *parent,
                                        const char *fmt, ...);
+extern int __must_check kobject_init_and_add(struct kobject *kobj,
+                                             struct kobj_type *ktype,
+                                             struct kobject *parent,
+                                             const char *fmt, ...);
+
 extern void kobject_del(struct kobject *);
 
 extern int __must_check kobject_rename(struct kobject *, const char *new_name);
diff --git a/lib/kobject.c b/lib/kobject.c
index 329fd1126b3f..8f249408b2ec 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -391,6 +391,33 @@ int kobject_add_ng(struct kobject *kobj, struct kobject *parent,
 EXPORT_SYMBOL(kobject_add_ng);
 
 /**
+ * kobject_init_and_add - initialize a kobject structure and add it to the kobject hierarchy
+ * @kobj: pointer to the kobject to initialize
+ * @ktype: pointer to the ktype for this kobject.
+ * @parent: pointer to the parent of this kobject.
+ * @fmt: the name of the kobject.
+ *
+ * This function combines the call to kobject_init_ng() and
+ * kobject_add_ng().  The same type of error handling after a call to
+ * kobject_add_ng() and kobject lifetime rules are the same here.
+ */
+int kobject_init_and_add(struct kobject *kobj, struct kobj_type *ktype,
+                         struct kobject *parent, const char *fmt, ...)
+{
+        va_list args;
+        int retval;
+
+        kobject_init_ng(kobj, ktype);
+
+        va_start(args, fmt);
+        retval = kobject_add_varg(kobj, parent, fmt, args);
+        va_end(args);
+
+        return retval;
+}
+EXPORT_SYMBOL_GPL(kobject_init_and_add);
+
+/**
  *      kobject_rename - change the name of an object
  *      @kobj:  object in question.
  *      @new_name: object's new name