Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...

[mirror_ubuntu-artful-kernel.git] / drivers / vfio / platform / vfio_platform_private.h

diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index fd262be2a443d5fa2b0083a5be9609efcdeb47f6..42816dd280cb98ac4e27fabced74c2d9aa1df3d7 100644 (file)
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -57,6 +57,9 @@ struct vfio_platform_device {
        int                             refcnt;
        struct mutex                    igate;
        struct module                   *parent_module;
+       const char                      *compat;
+       struct module                   *reset_module;
+       struct device                   *device;
 
        /*
         * These fields should be filled by the bus specific binder
@@ -80,12 +83,6 @@ struct vfio_platform_reset_node {
        vfio_platform_reset_fn_t reset;
 };
 
-struct vfio_platform_reset_combo {
-       const char *compat;
-       const char *reset_function_name;
-       const char *module_name;
-};
-
 extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,
                                      struct device *dev);
 extern struct vfio_platform_device *vfio_platform_remove_common