1 files changed, 45 insertions, 24 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 5cf30e95c8b6..a0cd2ced31a9 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -34,9 +34,24 @@ struct device;
 struct device_driver;
 struct class;
 struct class_device;
+struct bus_type;
+
+struct bus_attribute {
+        struct attribute        attr;
+        ssize_t (*show)(struct bus_type *, char * buf);
+        ssize_t (*store)(struct bus_type *, const char * buf, size_t count);
+};
+
+#define BUS_ATTR(_name,_mode,_show,_store)      \
+struct bus_attribute bus_attr_##_name = __ATTR(_name,_mode,_show,_store)
+
+extern int __must_check bus_create_file(struct bus_type *,
+                                        struct bus_attribute *);
+extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
 
 struct bus_type {
         const char              * name;
+        struct module           * owner;
 
         struct subsystem        subsys;
         struct kset             drivers;
@@ -49,6 +64,8 @@ struct bus_type {
         struct bus_attribute    * bus_attrs;
         struct device_attribute * dev_attrs;
         struct driver_attribute * drv_attrs;
+        struct bus_attribute drivers_autoprobe_attr;
+        struct bus_attribute drivers_probe_attr;
 
         int             (*match)(struct device * dev, struct device_driver * drv);
         int             (*uevent)(struct device *dev, char **envp,
@@ -61,6 +78,9 @@ struct bus_type {
         int (*suspend_late)(struct device * dev, pm_message_t state);
         int (*resume_early)(struct device * dev);
         int (*resume)(struct device * dev);
+
+        unsigned int drivers_autoprobe:1;
+        unsigned int multithread_probe:1;
 };
 
 extern int __must_check bus_register(struct bus_type * bus);
@@ -102,26 +122,10 @@ extern int bus_unregister_notifier(struct bus_type *bus,
 #define BUS_NOTIFY_UNBIND_DRIVER        0x00000004 /* driver about to be
                                                       unbound */
 
-/* sysfs interface for exporting bus attributes */
-
-struct bus_attribute {
-        struct attribute        attr;
-        ssize_t (*show)(struct bus_type *, char * buf);
-        ssize_t (*store)(struct bus_type *, const char * buf, size_t count);
-};
-
-#define BUS_ATTR(_name,_mode,_show,_store)      \
-struct bus_attribute bus_attr_##_name = __ATTR(_name,_mode,_show,_store)
-
-extern int __must_check bus_create_file(struct bus_type *,
-                                        struct bus_attribute *);
-extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
-
 struct device_driver {
         const char              * name;
         struct bus_type         * bus;
 
-        struct completion       unloaded;
         struct kobject          kobj;
         struct klist            klist_devices;
         struct klist_node       knode_bus;
@@ -135,8 +139,6 @@ struct device_driver {
         void    (*shutdown)     (struct device * dev);
         int     (*suspend)      (struct device * dev, pm_message_t state);
         int     (*resume)       (struct device * dev);
-
-        unsigned int multithread_probe:1;
 };
 
 
@@ -181,10 +183,9 @@ struct class {
         struct list_head        children;
         struct list_head        devices;
         struct list_head        interfaces;
+        struct kset             class_dirs;
         struct semaphore        sem;    /* locks both the children and interfaces lists */
 
-        struct kobject          *virtual_dir;
-
         struct class_attribute          * class_attrs;
         struct class_device_attribute   * class_dev_attrs;
         struct device_attribute         * dev_attrs;
@@ -328,11 +329,23 @@ extern struct class_device *class_device_create(struct class *cls,
                                         __attribute__((format(printf,5,6)));
 extern void class_device_destroy(struct class *cls, dev_t devt);
 
+/*
+ * The type of device, "struct device" is embedded in. A class
+ * or bus can contain devices of different types
+ * like "partitions" and "disks", "mouse" and "event".
+ * This identifies the device type and carries type-specific
+ * information, equivalent to the kobj_type of a kobject.
+ * If "name" is specified, the uevent will contain it in
+ * the DEVTYPE variable.
+ */
 struct device_type {
-        struct device_attribute *attrs;
+        const char *name;
+        struct attribute_group **groups;
         int (*uevent)(struct device *dev, char **envp, int num_envp,
                       char *buffer, int buffer_size);
         void (*release)(struct device *dev);
+        int (*suspend)(struct device * dev, pm_message_t state);
+        int (*resume)(struct device * dev);
 };
 
 /* interface for exporting device attributes */
@@ -354,8 +367,12 @@ extern int __must_check device_create_bin_file(struct device *dev,
                                                struct bin_attribute *attr);
 extern void device_remove_bin_file(struct device *dev,
                                    struct bin_attribute *attr);
-extern int device_schedule_callback(struct device *dev,
-                void (*func)(struct device *));
+extern int device_schedule_callback_owner(struct device *dev,
+                void (*func)(struct device *), struct module *owner);
+
+/* This is a macro to avoid include problems with THIS_MODULE */
+#define device_schedule_callback(dev, func)                     \
+        device_schedule_callback_owner(dev, func, THIS_MODULE)
 
 /* device resource management */
 typedef void (*dr_release_t)(struct device *dev, void *res);
@@ -554,7 +571,11 @@ extern const char *dev_driver_string(struct device *dev);
 #define dev_dbg(dev, format, arg...)            \
         dev_printk(KERN_DEBUG , dev , format , ## arg)
 #else
-#define dev_dbg(dev, format, arg...) do { (void)(dev); } while (0)
+static inline int __attribute__ ((format (printf, 2, 3)))
+dev_dbg(struct device * dev, const char * fmt, ...)
+{
+        return 0;
+}
 #endif
 
 #define dev_err(dev, format, arg...)            \