Merge branch 'linus' into x86/irq

1 files changed, 15 insertions, 1 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 8c23e3dfe3ac..6a2d04c011bc 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -183,7 +183,6 @@ struct class {
         struct module           *owner;
 
         struct kset             subsys;
-        struct list_head        children;
         struct list_head        devices;
         struct list_head        interfaces;
         struct kset             class_dirs;
@@ -386,6 +385,9 @@ static inline const char *dev_name(struct device *dev)
         return dev->bus_id;
 }
 
+extern int dev_set_name(struct device *dev, const char *name, ...)
+                        __attribute__((format(printf, 2, 3)));
+
 #ifdef CONFIG_NUMA
 static inline int dev_to_node(struct device *dev)
 {
@@ -450,9 +452,21 @@ extern int __must_check device_reprobe(struct device *dev);
 /*
  * Easy functions for dynamically creating devices on the fly
  */
+extern struct device *device_create_vargs(struct class *cls,
+                                          struct device *parent,
+                                          dev_t devt,
+                                          void *drvdata,
+                                          const char *fmt,
+                                          va_list vargs);
 extern struct device *device_create(struct class *cls, struct device *parent,
                                     dev_t devt, const char *fmt, ...)
                                     __attribute__((format(printf, 4, 5)));
+extern struct device *device_create_drvdata(struct class *cls,
+                                            struct device *parent,
+                                            dev_t devt,
+                                            void *drvdata,
+                                            const char *fmt, ...)
+                                    __attribute__((format(printf, 5, 6)));
 extern void device_destroy(struct class *cls, dev_t devt);
 
 /*