Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / include / linux / platform_device.h

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 9abf1db6aea652ee28152f39bd7e024995f07c75..16f6654082ddf82874a8531e51641d3bd62c1917 100644 (file)
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -178,9 +178,19 @@ struct platform_driver {
        int (*resume)(struct platform_device *);
        struct device_driver driver;
        const struct platform_device_id *id_table;
+       bool prevent_deferred_probe;
 };
 
-extern int platform_driver_register(struct platform_driver *);
+#define to_platform_driver(drv)        (container_of((drv), struct platform_driver, \
+                                driver))
+
+/*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+#define platform_driver_register(drv) \
+       __platform_driver_register(drv, THIS_MODULE)
+extern int __platform_driver_register(struct platform_driver *,
+                                       struct module *);
 extern void platform_driver_unregister(struct platform_driver *);
 
 /* non-hotpluggable platform devices may use this so that probe() and